From 64ef1dbdfdbfc9988210314f3cb44923432b7b52 Mon Sep 17 00:00:00 2001
From: Danny Yoo <dyoo@hashcollision.org>
Date: Thu, 18 Apr 2013 12:21:17 -0600
Subject: [PATCH] changing output from procedure to function

---
 .../runtime-src/baselib-format.js             |  6 ++--
 whalesong/repl-prototype/htdocs/tests.js      | 25 ++++++-------
 .../tests/more-tests/isolating-bug.expected   | 36 +++++++++----------
 3 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/whalesong/js-assembler/runtime-src/baselib-format.js b/whalesong/js-assembler/runtime-src/baselib-format.js
index 6596ff8..0e62c8d 100644
--- a/whalesong/js-assembler/runtime-src/baselib-format.js
+++ b/whalesong/js-assembler/runtime-src/baselib-format.js
@@ -68,7 +68,7 @@
         }
 
         if (baselib.functions.isProcedure(x)) {
-            return '#<procedure:' + x.displayName + '>';
+            return '#<function:' + x.displayName + '>';
         }
 
         if (typeof(x) !== 'object' && typeof(x) !== 'function') {
@@ -111,7 +111,7 @@
         }
 
         if (baselib.functions.isProcedure(x)) {
-            return '#<procedure:' + x.displayName + '>';
+            return '#<function:' + x.displayName + '>';
         }
 
         if (typeof(x) !== 'object' && typeof(x) !== 'function') {
@@ -415,7 +415,7 @@
 
         if (baselib.functions.isProcedure(x)) {
             node = document.createElement("span");
-            node.appendChild(document.createTextNode('#<procedure:' + x.displayName + '>'));
+            node.appendChild(document.createTextNode('#<function:' + x.displayName + '>'));
             $(node).addClass("procedure");
             return node;
         }
diff --git a/whalesong/repl-prototype/htdocs/tests.js b/whalesong/repl-prototype/htdocs/tests.js
index bb8ba20..decacdd 100644
--- a/whalesong/repl-prototype/htdocs/tests.js
+++ b/whalesong/repl-prototype/htdocs/tests.js
@@ -5,6 +5,7 @@ jQuery(document).ready(function() {
                                 // of this file.
     var outputSpan = $("<span/>");
 
+    var testsRunCount = 0;
     var failureCount = 0;
 
     var noteRedFailure = function(e) {
@@ -49,10 +50,12 @@ jQuery(document).ready(function() {
         $(document.body).append("running " + name + "... ");
         var success = function() {
             $(document.body).append(" ok").append($("<br/>"));
+            testsRunCount++;
             k();
         };
         var fail = function(e) {
             noteRedFailure(e);
+            testsRunCount++;
 	    $(document.body).append($("<br/>"));
             //	    $(document.body).append(e + '');
 	    //$(document.body).append($("<br/>"));
@@ -73,8 +76,6 @@ jQuery(document).ready(function() {
                 if (observedText === expectedText) {
                     success();
                 } else {
-                    console.log(err);
-                    console.log(observedText, expectedText);
                     fail("not the same: " + observedText + 
                          ", " +
                          expectedText);
@@ -92,7 +93,7 @@ jQuery(document).ready(function() {
     var queueErrorTest = function(name, code, expectedErrorText) {
         queueAsyncTest(name, function(success, fail) {
             var checkOutput = function(err) {
-                var errText = err + '';
+                var errText = ((err && err.message) || err) + '';
                 if (errText === expectedErrorText) {
                     success();
                 } else {
@@ -158,9 +159,9 @@ jQuery(document).ready(function() {
               "(string->symbol \"hello\")",
               "'hello");
 
-    queueTest("formatting lists",
-              "(format \"~a\" '(1 2))",
-              "\"(list 1 2)\"");
+    // queueTest("formatting lists",
+    //           "(format \"~a\" '(1 2))",
+    //           "\"(list 1 2)\"");
 
 
     queueTest("symbols that should not leak js implementation",
@@ -176,13 +177,9 @@ jQuery(document).ready(function() {
               "'__proto__");
 
 
-    queueErrorTest("set! is not enabled, part 1",
-                   "set!",
-                   "set!: this variable is not defined")
-
-    queueErrorTest("set! is not enabled, part 2",
-                   "(define x 42) (set! x 16)",
-                   "set!: this variable is not defined")
+    queueTest("simple set!",
+              "(define x 42) (set! x 16) x",
+              "16")
 
 
     queueErrorTest("test mis-application 1",
@@ -4273,7 +4270,7 @@ jQuery(document).ready(function() {
 
     var afterReplSetup = function(theRepl) {
         repl = theRepl;
-        runTests(function() { $("#is-running").text("Tests finished."); });
+        runTests(function() { $("#is-running").text("Tests finished.  " + testsRunCount + " tests executed."); });
     };
 
     $("#failure-index").css("display", "none");
diff --git a/whalesong/tests/more-tests/isolating-bug.expected b/whalesong/tests/more-tests/isolating-bug.expected
index 9ea2d90..3116465 100644
--- a/whalesong/tests/more-tests/isolating-bug.expected
+++ b/whalesong/tests/more-tests/isolating-bug.expected
@@ -1,27 +1,27 @@
 #<struct-type:swf>
-#<procedure:make-swf>
-#<procedure:swf?>
-#<procedure:swf-f>
-#<procedure:set-swf-f!>
+#<function:make-swf>
+#<function:swf?>
+#<function:swf-f>
+#<function:set-swf-f!>
 in the result of call-with-values
-(#<struct-type:swf> #<procedure:make-swf> #<procedure:swf?> #<procedure:swf-f> #<procedure:set-swf-f!>)
+(#<struct-type:swf> #<function:make-swf> #<function:swf?> #<function:swf-f> #<function:set-swf-f!>)
 ---
 #<struct-type:swf>
-#<procedure:make-swf>
-#<procedure:swf?>
-#<procedure:swf-f>
-#<procedure:set-swf-f!>
+#<function:make-swf>
+#<function:swf?>
+#<function:swf-f>
+#<function:set-swf-f!>
 ***
 #<struct-type:swf2>
-#<procedure:make-swf2>
-#<procedure:swf2?>
-#<procedure:swf2-f>
-#<procedure:set-swf2-f!>
+#<function:make-swf2>
+#<function:swf2?>
+#<function:swf2-f>
+#<function:set-swf2-f!>
 in the result of call-with-values
-(#<struct-type:swf2> #<procedure:make-swf2> #<procedure:swf2?> #<procedure:swf2-f> #<procedure:set-swf2-f!>)
+(#<struct-type:swf2> #<function:make-swf2> #<function:swf2?> #<function:swf2-f> #<function:set-swf2-f!>)
 ---
 #<struct-type:swf2>
-#<procedure:make-swf2>
-#<procedure:swf2?>
-#<procedure:swf2-f>
-#<procedure:set-swf2-f!>
+#<function:make-swf2>
+#<function:swf2?>
+#<function:swf2-f>
+#<function:set-swf2-f!>