From 60dda32c2e6d02a89d9ef55e93cfff5eaed91058 Mon Sep 17 00:00:00 2001 From: Danny Yoo Date: Tue, 5 Mar 2013 15:14:41 -0700 Subject: [PATCH] tracing down issue with multiple values at the repl. --- whalesong/compiler/compiler.rkt | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/whalesong/compiler/compiler.rkt b/whalesong/compiler/compiler.rkt index 7ec1212..d837ad7 100644 --- a/whalesong/compiler/compiler.rkt +++ b/whalesong/compiler/compiler.rkt @@ -93,24 +93,23 @@ ;; Begin a prompted evaluation: (make-PushControlFrame/Prompt default-continuation-prompt-tag after-pop-prompt:) - (compile exp '() 'val return-linkage/nontail) + (compile exp '() 'val next-linkage/keep-multiple-on-stack) ;; After coming back from the evaluation, rearrange the return values ;; as a list. - after-pop-prompt-multiple: (make-TestAndJump (make-TestZero (make-Reg 'argcount)) after-first-seq:) (make-PushImmediateOntoEnvironment (make-Reg 'val) #f) after-first-seq: (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:)) + after-pop-prompt-multiple: + (make-PopEnvironment (make-SubtractArg (make-Reg 'argcount) (make-Const 1)) + (make-Const 0)) after-pop-prompt: - (make-PushImmediateOntoEnvironment (make-Reg 'val) #f) - (make-Perform (make-UnspliceRestFromStack! (make-Const 0) (make-Const 1))) - - last: - (make-AssignImmediate 'val (make-EnvLexicalReference 0 #f)) - (make-PopEnvironment (make-Const 1) (make-Const 0)))))) + last:))))