From a2a8a8c1baf21f253f9f109fc4cdec06df800963 Mon Sep 17 00:00:00 2001
From: Danny Yoo <dyoo@hashcollision.org>
Date: Wed, 17 Apr 2013 17:12:44 -0600
Subject: [PATCH] cleanup

---
 whalesong/compiler/compiler.rkt     | 16 ++++------------
 whalesong/compiler/il-structs.rkt   | 10 +---------
 whalesong/compiler/optimize-il.rkt  |  7 +------
 whalesong/js-assembler/assemble.rkt | 10 ++--------
 4 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/whalesong/compiler/compiler.rkt b/whalesong/compiler/compiler.rkt
index 0b8907e..2a8a426 100644
--- a/whalesong/compiler/compiler.rkt
+++ b/whalesong/compiler/compiler.rkt
@@ -59,8 +59,7 @@
      
      ;; Begin a prompted evaluation:
      (make-PushControlFrame/Prompt default-continuation-prompt-tag
-                                   before-pop-prompt
-                                   #f)
+                                   before-pop-prompt)
      (compile exp '() 'val return-linkage/nontail)
      before-pop-prompt-multiple
      (make-PopEnvironment (make-SubtractArg (make-Reg 'argcount) (make-Const 1))
@@ -94,8 +93,7 @@
      
      ;; Begin a prompted evaluation:
      (make-PushControlFrame/Prompt default-continuation-prompt-tag
-                                   handle-return:
-                                   #f)
+                                   handle-return:)
      (compile exp '() 'val return-linkage/nontail)
       
      handle-multiple-return:
@@ -108,10 +106,6 @@
      bundle-values-into-list:
      (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:
      ;; Finally, return to the success continuation on the stack.
      (make-AssignImmediate 'proc (make-ControlStackLabel))
@@ -577,8 +571,7 @@
           cenv
           (append-instruction-sequences 
            (make-PushControlFrame/Prompt default-continuation-prompt-tag
-                                         on-return
-                                         #f)
+                                         on-return)
            (compile (first seq) cenv 'val return-linkage/nontail)
            (emit-values-context-check-on-procedure-return (linkage-context linkage)
                                                           on-return/multiple
@@ -589,8 +582,7 @@
            (new-linked-labels 'beforePromptPop))
          (append-instruction-sequences 
           (make-PushControlFrame/Prompt (make-DefaultContinuationPromptTag)
-                                        on-return
-                                        #f)
+                                        on-return)
           
           (compile (first seq) cenv 'val return-linkage/nontail)
           on-return/multiple
diff --git a/whalesong/compiler/il-structs.rkt b/whalesong/compiler/il-structs.rkt
index 7b3785f..be39704 100644
--- a/whalesong/compiler/il-structs.rkt
+++ b/whalesong/compiler/il-structs.rkt
@@ -267,15 +267,7 @@
 
 (define-struct: PushControlFrame/Prompt
   ([tag : (U OpArg DefaultContinuationPromptTag)]
-   [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)])
+   [label : LinkedLabel])
   #:transparent)
 
 
diff --git a/whalesong/compiler/optimize-il.rkt b/whalesong/compiler/optimize-il.rkt
index cdb168c..2276350 100644
--- a/whalesong/compiler/optimize-il.rkt
+++ b/whalesong/compiler/optimize-il.rkt
@@ -246,12 +246,7 @@
                                                     tag
                                                     (rewrite-oparg tag)))
                                               (make-LinkedLabel (LinkedLabel-label 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))))))
+                                                                (ref (LinkedLabel-linked-to a-label))))
                 (loop (rest stmts)))]
          
          [(PopControlFrame? a-stmt)
diff --git a/whalesong/js-assembler/assemble.rkt b/whalesong/js-assembler/assemble.rkt
index c637ce0..df85e63 100644
--- a/whalesong/js-assembler/assemble.rkt
+++ b/whalesong/js-assembler/assemble.rkt
@@ -583,7 +583,7 @@ EOF
                     (assemble-label (make-Label (LinkedLabel-label label)))])))]
       
       [(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)])
                  (cond
                    [(symbol? label) 
@@ -597,13 +597,7 @@ EOF
                    [(DefaultContinuationPromptTag? tag)
                     (assemble-default-continuation-prompt-tag)]
                    [(OpArg? tag)
-                    (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)))])))]
+                    (assemble-oparg tag blockht)])))]
       
       [(PopControlFrame? stmt)
        "M.c.pop();"]