X-Git-Url: http://git.hcoop.net/clinton/parenscript.git/blobdiff_plain/9831d514e9cd52a133bb3c66ea26d67b0e7d08b0..16151f19dc3ade7da3195fd7cc08ad3bff135d3f:/t/reference-tests.lisp

diff --git a/t/reference-tests.lisp b/t/reference-tests.lisp
index f749d18..3f1c06a 100644
--- a/t/reference-tests.lisp
+++ b/t/reference-tests.lisp
@@ -259,12 +259,12 @@ x = a + b + c;")
 (test-ps-js assignment-5
   (let ((a 1) (b 2))
   (psetf a b b a))
-  "var a1 = 1;
-var b2 = 2;
-var _js3_5 = b2;
-var _js4_6 = a1;
-a1 = _js3_5;
-b2 = _js4_6;")
+  "var a = 1;
+var b = 2;
+var _js1 = b;
+var _js2 = a;
+a = _js1;
+b = _js2;")
 
 (test-ps-js assignment-6
   (setq a 1)
@@ -279,9 +279,9 @@ b2 = _js4_6;")
 
 (test-ps-js assignment-9
   (setf (color some-div) (+ 23 "em"))
-  "var _js2_3 = someDiv;
-var _js1_4 = 23 + 'em';
-__setf_color(_js1_4, _js2_3);")
+  "var _js2 = someDiv;
+var _js1 = 23 + 'em';
+__setf_color(_js1, _js2);")
 
 (test-ps-js assignment-10
   (defsetf left (el) (offset)
@@ -290,9 +290,9 @@ __setf_color(_js1_4, _js2_3);")
 
 (test-ps-js assignment-11
   (setf (left some-div) (+ 123 "px"))
-  "var _js2_3 = someDiv;
-var _js1_4 = 123 + 'px';
-_js2_3.style.left = _js1_4;")
+  "var _js2 = someDiv;
+var _js1 = 123 + 'px';
+_js2.style.left = _js1;")
 
 (test-ps-js assignment-12
   (macrolet ((left (el)
@@ -366,16 +366,16 @@ _js2_3.style.left = _js1_4;")
            (x (+ x y)))
       (+ *a* x y))))
   "var A = 4;
-var x1 = 1;
-var A2;
+var x = 1;
+var A_TMPSTACK1;
 try {
-    A2 = A;
+    A_TMPSTACK1 = A;
     A = 2;
-    var y3 = x1 + 1;
-    var x4 = x1 + y3;
-    A + x4 + y3;
+    var y = x + 1;
+    var x2 = x + y;
+    A + x2 + y;
 } finally {
-    A = A2;
+    A = A_TMPSTACK1;
 };")
 
 (test-ps-js iteration-constructs-1
@@ -396,14 +396,14 @@ try {
      (s 0 (+ s i (1+ i))))
     ((> i 10))
   ((@ document write) (+ "i: " i " s: " s "<br/>")))
-  "var i1 = 0;
-var s2 = 0;
-for (; i1 <= 10; ) {
-    document.write('i: ' + i1 + ' s: ' + s2 + '<br/>');
-    var _js3_5 = i1 + 1;
-    var _js4_6 = s2 + i1 + (i1 + 1);
-    i1 = _js3_5;
-    s2 = _js4_6;
+  "var i = 0;
+var s = 0;
+for (; i <= 10; ) {
+    document.write('i: ' + i + ' s: ' + s + '<br/>');
+    var _js1 = i + 1;
+    var _js2 = s + i + (i + 1);
+    i = _js1;
+    s = _js2;
 };")
 
 (test-ps-js iteration-constructs-3
@@ -419,9 +419,9 @@ for (; i1 <= 10; ) {
   (let ((arr (array "a" "b" "c" "d" "e")))
   (dotimes (i (@ arr length))
     ((@ document write) (+ "i: " i " arr[i]: " (aref arr i) "<br/>"))))
-  "var arr1 = ['a', 'b', 'c', 'd', 'e'];
-for (var i = 0; i < arr1.length; i += 1) {
-    document.write('i: ' + i + ' arr[i]: ' + arr1[i] + '<br/>');
+  "var arr = ['a', 'b', 'c', 'd', 'e'];
+for (var i = 0; i < arr.length; i += 1) {
+    document.write('i: ' + i + ' arr[i]: ' + arr[i] + '<br/>');
 };")
 
 (test-ps-js iteration-constructs-5
@@ -429,21 +429,21 @@ for (var i = 0; i < arr1.length; i += 1) {
   (alert (+ "Summation to 10 is "
             (dotimes (i 10 res)
               (incf res (1+ i))))))
-  "var res1 = 0;
+  "var res = 0;
 alert('Summation to 10 is ' + (function () {
     for (var i = 0; i < 10; i += 1) {
-        res1 += i + 1;
+        res += i + 1;
     };
-    return res1;
+    return res;
 })());")
 
 (test-ps-js iteration-constructs-6
   (let ((l (list 1 2 4 8 16 32)))
   (dolist (c l)
     ((@ document write) (+ "c: " c "<br/>"))))
-  "var l1 = [1, 2, 4, 8, 16, 32];
-for (var c = null, _js_arrvar3 = l1, _js_idx2 = 0; _js_idx2 < _js_arrvar3.length; _js_idx2 += 1) {
-    c = _js_arrvar3[_js_idx2];
+  "var l = [1, 2, 4, 8, 16, 32];
+for (var c = null, _js_arrvar2 = l, _js_idx1 = 0; _js_idx1 < _js_arrvar2.length; _js_idx1 += 1) {
+    c = _js_arrvar2[_js_idx1];
     document.write('c: ' + c + '<br/>');
 };")
 
@@ -453,23 +453,23 @@ for (var c = null, _js_arrvar3 = l1, _js_idx2 = 0; _js_idx2 < _js_arrvar3.length
   (alert (+ "Sum of " l " is: "
             (dolist (c l s)
               (incf s c)))))
-  "var l1 = [1, 2, 4, 8, 16, 32];
-var s2 = 0;
-alert('Sum of ' + l1 + ' is: ' + (function () {
-    for (var c = null, _js_arrvar4 = l1, _js_idx3 = 0; _js_idx3 < _js_arrvar4.length; _js_idx3 += 1) {
-        c = _js_arrvar4[_js_idx3];
-        s2 += c;
+  "var l = [1, 2, 4, 8, 16, 32];
+var s = 0;
+alert('Sum of ' + l + ' is: ' + (function () {
+    for (var c = null, _js_arrvar2 = l, _js_idx1 = 0; _js_idx1 < _js_arrvar2.length; _js_idx1 += 1) {
+        c = _js_arrvar2[_js_idx1];
+        s += c;
     };
-    return s2;
+    return s;
 })());")
 
 (test-ps-js iteration-constructs-8
   (let ((obj (create :a 1 :b 2 :c 3)))
   (for-in (i obj)
     ((@ document write) (+ i ": " (aref obj i) "<br/>"))))
-  "var obj1 = { a : 1, b : 2, c : 3 };
-for (var i in obj1) {
-    document.write(i + ': ' + obj1[i] + '<br/>');
+  "var obj = { a : 1, b : 2, c : 3 };
+for (var i in obj) {
+    document.write(i + ': ' + obj[i] + '<br/>');
 };")
 
 (test-ps-js iteration-constructs-9
@@ -548,10 +548,10 @@ for (var i in obj1) {
    (setf (@ element inner-h-t-m-l)
          (ps-html ((:textarea (or disabled (not authorized)) :disabled "disabled")
                 "Edit me"))))
-  "var disabled1 = null;
-var authorized2 = true;
+  "var disabled = null;
+var authorized = true;
 element.innerHTML =
 '<TEXTAREA'
-+ (disabled1 || !authorized2 ? ' DISABLED=\"' + 'disabled' + '\"' : '')
++ (disabled || !authorized ? ' DISABLED=\"' + 'disabled' + '\"' : '')
 + '>Edit me</TEXTAREA>';")