Form predicates now know that a BEGIN with DECLAREs followed by

expression should be treated like the expression.

diff --git a/v8/src/compiler/midend/utils.scm b/v8/src/compiler/midend/utils.scm
index cee21ef5393bdcfe41eb5d5558f3f192b5aff2eb..947568472734bf418fa1c41567318af6424caa41 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.15 1995/02/21 21:19:28 adams Exp $
+$Id: utils.scm,v 1.16 1995/02/22 05:50:15 adams Exp $
 
 Copyright (c) 1994 Massachusetts Institute of Technology
 
@@ -523,6 +523,14 @@ Example use of FORM/COPY-TRANSFORMING:
 |#
                          
 \f
+(define (begin-sans-declarations form)
+  ;; If the begin form is a sequence of declarations followed by a single
+  ;; form then return that form, else return #F
+  (let loop ((exprs (begin/actions form)))
+    (cond ((null? exprs) (internal-error "No non-declare subform" form))
+         ((DECLARE/? (car exprs)) (loop (cdr exprs)))
+         (else (if (null? (cdr exprs) (car exprs) #F))))))
+
 (define (form/satisfies? form operator-properties)
   (let walk ((expr form))
     (and (pair? expr)
@@ -537,6 +545,9 @@ Example use of FORM/COPY-TRANSFORMING:
              (and (QUOTE/? rator)
                   (operator/satisfies? (quote/text rator) operator-properties)
                   (for-all? (call/cont-and-operands expr) walk))))
+          ((BEGIN)
+           (cond ((begin-sans-declarations form) => walk)
+                 (else false)))
           (else false)))))
 
 (define (form/simple&side-effect-free? operand)
@@ -561,6 +572,9 @@ Example use of FORM/COPY-TRANSFORMING:
                   (predicate (quote/text rator))
                   (for-all? (call/cont-and-operands form)
                     form/simple&side-effect-free?))))
+          ((BEGIN)
+           (cond ((begin-sans-declarations form) => walk)
+                 (else false)))
           (else false)))))
 
 (define (simple-operator? rator)