suzanne.soy/whalesong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changing output from procedure to function

Browse Source
This commit is contained in:
Danny Yoo 2013-04-18 12:21:17 -06:00
parent 602f27ef4e
commit 64ef1dbdfd
3 changed files with 32 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
whalesong/js-assembler/runtime-src/baselib-format.js
View File

@ -68,7 +68,7 @@
} }
if (baselib.functions.isProcedure(x)) { if (baselib.functions.isProcedure(x)) {
return '#<procedure:' + x.displayName + '>'; return '#<function:' + x.displayName + '>';
} }
if (typeof(x) !== 'object' && typeof(x) !== 'function') { if (typeof(x) !== 'object' && typeof(x) !== 'function') {
@ -111,7 +111,7 @@
} }
if (baselib.functions.isProcedure(x)) { if (baselib.functions.isProcedure(x)) {
return '#<procedure:' + x.displayName + '>'; return '#<function:' + x.displayName + '>';
} }
if (typeof(x) !== 'object' && typeof(x) !== 'function') { if (typeof(x) !== 'object' && typeof(x) !== 'function') {
@ -415,7 +415,7 @@
if (baselib.functions.isProcedure(x)) { if (baselib.functions.isProcedure(x)) {
node = document.createElement("span"); node = document.createElement("span");
node.appendChild(document.createTextNode('#<procedure:' + x.displayName + '>')); node.appendChild(document.createTextNode('#<function:' + x.displayName + '>'));
$(node).addClass("procedure"); $(node).addClass("procedure");
return node; return node;
} }

25
whalesong/repl-prototype/htdocs/tests.js
View File

@ -5,6 +5,7 @@ jQuery(document).ready(function() {
// of this file. // of this file.
var outputSpan = $("<span/>"); var outputSpan = $("<span/>");
var testsRunCount = 0;
var failureCount = 0; var failureCount = 0;
var noteRedFailure = function(e) { var noteRedFailure = function(e) {
@ -49,10 +50,12 @@ jQuery(document).ready(function() {
$(document.body).append("running " + name + "... "); $(document.body).append("running " + name + "... ");
var success = function() { var success = function() {
$(document.body).append(" ok").append($("<br/>")); $(document.body).append(" ok").append($("<br/>"));
testsRunCount++;
k(); k();
}; };
var fail = function(e) { var fail = function(e) {
noteRedFailure(e); noteRedFailure(e);
testsRunCount++;
$(document.body).append($("<br/>")); $(document.body).append($("<br/>"));
// $(document.body).append(e + ''); // $(document.body).append(e + '');
//$(document.body).append($("<br/>")); //$(document.body).append($("<br/>"));
@ -73,8 +76,6 @@ jQuery(document).ready(function() {
if (observedText === expectedText) { if (observedText === expectedText) {
success(); success();
} else { } else {
console.log(err);
console.log(observedText, expectedText);
fail("not the same: " + observedText + fail("not the same: " + observedText +
", " + ", " +
expectedText); expectedText);
@ -92,7 +93,7 @@ jQuery(document).ready(function() {
var queueErrorTest = function(name, code, expectedErrorText) { var queueErrorTest = function(name, code, expectedErrorText) {
queueAsyncTest(name, function(success, fail) { queueAsyncTest(name, function(success, fail) {
var checkOutput = function(err) { var checkOutput = function(err) {
var errText = err + ''; var errText = ((err && err.message) || err) + '';
if (errText === expectedErrorText) { if (errText === expectedErrorText) {
success(); success();
} else { } else {
@ -158,9 +159,9 @@ jQuery(document).ready(function() {
"(string->symbol \"hello\")", "(string->symbol \"hello\")",
"'hello"); "'hello");
queueTest("formatting lists", // queueTest("formatting lists",
"(format \"~a\" '(1 2))", // "(format \"~a\" '(1 2))",
"\"(list 1 2)\""); // "\"(list 1 2)\"");
queueTest("symbols that should not leak js implementation", queueTest("symbols that should not leak js implementation",
@ -176,13 +177,9 @@ jQuery(document).ready(function() {
"'__proto__"); "'__proto__");
queueErrorTest("set! is not enabled, part 1", queueTest("simple set!",
"set!", "(define x 42) (set! x 16) x",
"set!: this variable is not defined") "16")
queueErrorTest("set! is not enabled, part 2",
"(define x 42) (set! x 16)",
"set!: this variable is not defined")
queueErrorTest("test mis-application 1", queueErrorTest("test mis-application 1",
@ -4273,7 +4270,7 @@ jQuery(document).ready(function() {
var afterReplSetup = function(theRepl) { var afterReplSetup = function(theRepl) {
repl = 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"); $("#failure-index").css("display", "none");

36
whalesong/tests/more-tests/isolating-bug.expected
View File

@ -1,27 +1,27 @@
#<struct-type:swf> #<struct-type:swf>
#<procedure:make-swf> #<function:make-swf>
#<procedure:swf?> #<function:swf?>
#<procedure:swf-f> #<function:swf-f>
#<procedure:set-swf-f!> #<function:set-swf-f!>
in the result of call-with-values 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> #<struct-type:swf>
#<procedure:make-swf> #<function:make-swf>
#<procedure:swf?> #<function:swf?>
#<procedure:swf-f> #<function:swf-f>
#<procedure:set-swf-f!> #<function:set-swf-f!>
*** ***
#<struct-type:swf2> #<struct-type:swf2>
#<procedure:make-swf2> #<function:make-swf2>
#<procedure:swf2?> #<function:swf2?>
#<procedure:swf2-f> #<function:swf2-f>
#<procedure:set-swf2-f!> #<function:set-swf2-f!>
in the result of call-with-values 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> #<struct-type:swf2>
#<procedure:make-swf2> #<function:make-swf2>
#<procedure:swf2?> #<function:swf2?>
#<procedure:swf2-f> #<function:swf2-f>
#<procedure:set-swf2-f!> #<function:set-swf2-f!>