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

cleanup

Browse Source
This commit is contained in:
Danny Yoo 2013-04-17 17:12:44 -06:00
parent afcca54ea7
commit a2a8a8c1ba
4 changed files with 8 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
whalesong/compiler/compiler.rkt
View File

@ -59,8 +59,7 @@
;; Begin a prompted evaluation: ;; Begin a prompted evaluation:
(make-PushControlFrame/Prompt default-continuation-prompt-tag (make-PushControlFrame/Prompt default-continuation-prompt-tag
before-pop-prompt before-pop-prompt)
#f)
(compile exp '() 'val return-linkage/nontail) (compile exp '() 'val return-linkage/nontail)
before-pop-prompt-multiple before-pop-prompt-multiple
(make-PopEnvironment (make-SubtractArg (make-Reg 'argcount) (make-Const 1)) (make-PopEnvironment (make-SubtractArg (make-Reg 'argcount) (make-Const 1))
@ -94,8 +93,7 @@
;; Begin a prompted evaluation: ;; Begin a prompted evaluation:
(make-PushControlFrame/Prompt default-continuation-prompt-tag (make-PushControlFrame/Prompt default-continuation-prompt-tag
handle-return: handle-return:)
#f)
(compile exp '() 'val return-linkage/nontail) (compile exp '() 'val return-linkage/nontail)
handle-multiple-return: handle-multiple-return:
@ -108,10 +106,6 @@
bundle-values-into-list: bundle-values-into-list:
(make-Goto (make-Label last:)) (make-Goto (make-Label last:))
;; FIXME: missing the abort handler. if we abort, we want the
;; handler to call the thunk in the context that packages the
;; results into a list.
last: last:
;; Finally, return to the success continuation on the stack. ;; Finally, return to the success continuation on the stack.
(make-AssignImmediate 'proc (make-ControlStackLabel)) (make-AssignImmediate 'proc (make-ControlStackLabel))
@ -577,8 +571,7 @@
cenv cenv
(append-instruction-sequences (append-instruction-sequences
(make-PushControlFrame/Prompt default-continuation-prompt-tag (make-PushControlFrame/Prompt default-continuation-prompt-tag
on-return on-return)
#f)
(compile (first seq) cenv 'val return-linkage/nontail) (compile (first seq) cenv 'val return-linkage/nontail)
(emit-values-context-check-on-procedure-return (linkage-context linkage) (emit-values-context-check-on-procedure-return (linkage-context linkage)
on-return/multiple on-return/multiple
@ -589,8 +582,7 @@
(new-linked-labels 'beforePromptPop)) (new-linked-labels 'beforePromptPop))
(append-instruction-sequences (append-instruction-sequences
(make-PushControlFrame/Prompt (make-DefaultContinuationPromptTag) (make-PushControlFrame/Prompt (make-DefaultContinuationPromptTag)
on-return on-return)
#f)
(compile (first seq) cenv 'val return-linkage/nontail) (compile (first seq) cenv 'val return-linkage/nontail)
on-return/multiple on-return/multiple

10
whalesong/compiler/il-structs.rkt
View File

@ -267,15 +267,7 @@
(define-struct: PushControlFrame/Prompt (define-struct: PushControlFrame/Prompt
([tag : (U OpArg DefaultContinuationPromptTag)] ([tag : (U OpArg DefaultContinuationPromptTag)]
[label : LinkedLabel] [label : LinkedLabel])
[handler : (U #f
;; #f stands for using the default abort handler.
;;
;; The only other case the compiler needs to deal
;; with is capturing a closure, when we need to abort
;; with a special handler (currently for repl).
;; Maybe just use the 'proc register for simplicity?
#;OpArg)])
#:transparent) #:transparent)

7
whalesong/compiler/optimize-il.rkt
View File

@ -246,12 +246,7 @@
tag tag
(rewrite-oparg tag))) (rewrite-oparg tag)))
(make-LinkedLabel (LinkedLabel-label a-label) (make-LinkedLabel (LinkedLabel-label a-label)
(ref (LinkedLabel-linked-to a-label))) (ref (LinkedLabel-linked-to a-label))))
(let ([handler (PushControlFrame/Prompt-handler a-stmt)])
(if (eq? handler #f)
#f
(make-LinkedLabel (LinkedLabel-label handler)
(ref (LinkedLabel-linked-to handler))))))
(loop (rest stmts)))] (loop (rest stmts)))]
[(PopControlFrame? a-stmt) [(PopControlFrame? a-stmt)

10
whalesong/js-assembler/assemble.rkt
View File

@ -583,7 +583,7 @@ EOF
(assemble-label (make-Label (LinkedLabel-label label)))])))] (assemble-label (make-Label (LinkedLabel-label label)))])))]
[(PushControlFrame/Prompt? stmt) [(PushControlFrame/Prompt? stmt)
(format "M.c.push(new RT.CallFrame(~a,M.p)); M.addPrompt(~a,~a);" (format "M.c.push(new RT.CallFrame(~a,M.p)); M.addPrompt(~a,false);"
(let: ([label : (U Symbol LinkedLabel) (PushControlFrame/Prompt-label stmt)]) (let: ([label : (U Symbol LinkedLabel) (PushControlFrame/Prompt-label stmt)])
(cond (cond
[(symbol? label) [(symbol? label)
@ -597,13 +597,7 @@ EOF
[(DefaultContinuationPromptTag? tag) [(DefaultContinuationPromptTag? tag)
(assemble-default-continuation-prompt-tag)] (assemble-default-continuation-prompt-tag)]
[(OpArg? tag) [(OpArg? tag)
(assemble-oparg tag blockht)])) (assemble-oparg tag blockht)])))]
(let: ([handler : (U LinkedLabel #f) (PushControlFrame/Prompt-handler stmt)])
(cond
[(eq? handler #f)
"false"]
[else
(assemble-label (make-Label (LinkedLabel-label handler)))])))]
[(PopControlFrame? stmt) [(PopControlFrame? stmt)
"M.c.pop();"] "M.c.pop();"]