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

correcting the return values continuation.

Browse Source
This commit is contained in:
Danny Yoo 2013-04-17 16:57:45 -06:00
parent 57ef1d4a7d
commit d916cecdc9
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
whalesong/compiler/compiler.rkt
View File

@ -100,16 +100,12 @@
handle-multiple-return: handle-multiple-return:
;; After coming back from the evaluation, rearrange the return ;; After coming back from the evaluation, rearrange the return
;; values as a list. ;; values, to call the continuation with those as arguments.
(make-TestAndJump (make-TestZero (make-Reg 'argcount)) (make-TestAndJump (make-TestZero (make-Reg 'argcount))
bundle-values-into-list:) bundle-values-into-list:)
handle-return: handle-return:
(make-PushImmediateOntoEnvironment (make-Reg 'val) #f) (make-PushImmediateOntoEnvironment (make-Reg 'val) #f)
bundle-values-into-list: bundle-values-into-list:
(make-Perform (make-UnspliceRestFromStack!
(make-Const 0) (make-Reg 'argcount)))
(make-AssignImmediate 'val (make-EnvLexicalReference 0 #f))
(make-PopEnvironment (make-Const 1) (make-Const 0))
(make-Goto (make-Label last:)) (make-Goto (make-Label last:))
;; FIXME: missing the abort handler. if we abort, we want the ;; FIXME: missing the abort handler. if we abort, we want the

12
whalesong/repl-prototype/htdocs/repl.js
View File

@ -166,10 +166,14 @@
// Indirect eval usage here is deliberate. // Indirect eval usage here is deliberate.
var codeFunction = (0,eval)(code); var codeFunction = (0,eval)(code);
var onGoodEvaluation = function() { var onGoodEvaluation = function() {
var resultList = that.M.v; var resultCount = that.M.a;
while(resultList !== plt.baselib.lists.EMPTY) { var results = [];
print(that, resultList.first); var i;
resultList = resultList.rest; for (i = 0; i < resultCount; i++) {
results.push(that.M.e[that.M.e.length - 1 - i]);
}
for (i = 0; i < results.length; i++) {
print(that, results[i]);
}; };
k(); k();
}; };