Changed BEGINNIFY to work incrementally, i.e. assume that BEGIN

subforms have been BEGINNIFY-ied.

diff --git a/v8/src/compiler/midend/cleanup.scm b/v8/src/compiler/midend/cleanup.scm
index 1af08f348da1c86dec8c3877a8f720d58f1277d1..abaacf2ce5eebbd05b527989d867caa7b32a8d6f 100644 (file)
--- a/v8/src/compiler/midend/cleanup.scm
+++ b/v8/src/compiler/midend/cleanup.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: cleanup.scm,v 1.16 1995/04/27 23:18:34 adams Exp $
+$Id: cleanup.scm,v 1.17 1995/05/06 18:04:45 adams Exp $
 
 Copyright (c) 1994-1995 Massachusetts Institute of Technology
 
@@ -135,7 +135,7 @@ MIT in each case. |#
          (else  (default)))))
 \f
 (define-cleanup-handler BEGIN (env #!rest actions)
-  (beginnify (cleanup/expr* env actions)))
+  (beginnify (cleanup/expr* env actions) #T))
 
 (define-cleanup-handler LET (env bindings body)
   (cleanup/let* cleanup/letify env bindings body))

diff --git a/v8/src/compiler/midend/utils.scm b/v8/src/compiler/midend/utils.scm
index 2873f24e2ce0d1ce38c88f9a64351166ee52dcaf..7d606d9cb30ebb08ca421844cd20302fa09ded8d 100644 (file)
--- a/v8/src/compiler/midend/utils.scm
+++ b/v8/src/compiler/midend/utils.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: utils.scm,v 1.23 1995/05/05 12:55:51 adams Exp $
+$Id: utils.scm,v 1.24 1995/05/06 18:04:53 adams Exp $
 
 Copyright (c) 1994-1995 Massachusetts Institute of Technology
 
@@ -219,10 +219,14 @@ MIT in each case. |#
        (else
         `(IF ,left ,right (QUOTE #F)))))
 
-(define (beginnify actions)
+(define (beginnify actions #!optional incremental?)
   ;; Flattens the ACTIONS, discarding any in non-tail position that
   ;; are side-effect free or static (compile-time only).  It
   ;; returns (BEGIN) or (BEGIN <action>+ <expression>) or <expression>
+  ;; If INCREMENTAL? is specified and true, BEGIN forms within ACTIONS are
+  ;; assumed to already satisfy the output conditions, otherwise they
+  ;; will be processed.
+  (let ((incremental? (and (not (default-object? incremental?)) incremental?)))
   (let loop ((actions (reverse actions))
             (actions* '()))
     (cond ((null? actions)
@@ -230,24 +234,24 @@ MIT in each case. |#
                   (not (null? (cdr actions*))))
               `(BEGIN ,@actions*)
               (car actions*)))
-         ((not (pair? (car actions)))
-          (internal-warning "BEGINNIFY: Non-pair form in BEGIN:"
-                            (car actions))
-          (loop (cdr actions)
-                (cons (car actions) actions*)))
-         ((eq? (caar actions) 'BEGIN)
-          (loop (append (reverse (cdar actions)) (cdr actions))
-                actions*))
+         ((BEGIN/? (car actions))
+          (if incremental?
+              (loop (cdr actions)
+                    (append (begin/exprs (car actions)) actions*))
+              (loop (append (reverse (begin/expr (car actions)))
+                            (cdr actions))
+                    actions*)))
          ((and (not (null? actions*))
                (or (form/satisfies? (car actions) '(SIDE-EFFECT-FREE))
-                   (and (form/satisfies? (car actions) '(STATIC))
+                   (and compiler:guru?
+                        (form/satisfies? (car actions) '(STATIC))
                         (begin
                           (write-line `(BEGINNIFY ELIDING ,(car actions)))
                           #T))))
           (loop (cdr actions) actions*))
          (else
           (loop (cdr actions)
-                (cons (car actions) actions*))))))
+                (cons (car actions) actions*)))))))
 
 (define (simplify-actions expressions)
   ;; Takes a list of expressions, as in a BEGIN body, and produces a