Move all `integrate-external' declarations into the files, using

relative pathnames.

diff --git a/v7/src/sf/cgen.scm b/v7/src/sf/cgen.scm
index 6e4ff09f3c34b6bbe67d461c4c04e04c7e7ec14e..4fd5847a49adac1d3fb42e4ebb9722e2863cf185 100644 (file)
--- a/v7/src/sf/cgen.scm
+++ b/v7/src/sf/cgen.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/sf/cgen.scm,v 3.5 1988/03/22 17:35:09 jrm Rel $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/sf/cgen.scm,v 3.6 1988/04/23 08:49:37 cph Exp $
 
-Copyright (c) 1987 Massachusetts Institute of Technology
+Copyright (c) 1988 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -34,10 +34,11 @@ MIT in each case. |#
 
 ;;;; SCode Optimizer: Generate SCode from Expression
 
-(declare (usual-integrations))
-(declare (automagic-integrations))
-(declare (open-block-optimizations))
-(declare (eta-substitution))
+(declare (usual-integrations)
+        (automagic-integrations)
+        (open-block-optimizations)
+        (eta-substitution)
+        (integrate-external "object"))
 \f
 (define (cgen/external quotation)
   (fluid-let ((flush-declarations? true))

diff --git a/v7/src/sf/chtype.scm b/v7/src/sf/chtype.scm
index c992c1e60633bd413b65db74d4236737d33f8ce1..727c9b1a55f9a4805a3870b8db153bb0948841ce 100644 (file)
--- a/v7/src/sf/chtype.scm
+++ b/v7/src/sf/chtype.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/sf/chtype.scm,v 1.2 1988/03/22 17:35:34 jrm Rel $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/sf/chtype.scm,v 1.3 1988/04/23 08:49:52 cph Exp $
 
-Copyright (c) 1987 Massachusetts Institute of Technology
+Copyright (c) 1988 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -34,8 +34,9 @@ MIT in each case. |#
 
 ;;;; SCode Optimizer: Intern object types
 
-(declare (usual-integrations))
-(declare (automagic-integrations))
+(declare (usual-integrations)
+        (automagic-integrations)
+        (integrate-external "object" "mvalue"))
 \f
 (define (change-type/external block expression)
   (change-type/block block)

diff --git a/v7/src/sf/copy.scm b/v7/src/sf/copy.scm
index 3dab4ae0d12fb52c234f454423518bf026b617ce..e3ee471b40d056d0953d74ffccbd2948cf9b4ca3 100644 (file)
--- a/v7/src/sf/copy.scm
+++ b/v7/src/sf/copy.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/sf/copy.scm,v 3.7 1988/03/22 17:36:06 jrm Rel $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/sf/copy.scm,v 3.8 1988/04/23 08:50:05 cph Exp $
 
-Copyright (c) 1987 Massachusetts Institute of Technology
+Copyright (c) 1988 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -34,10 +34,11 @@ MIT in each case. |#
 
 ;;;; SCode Optimizer: Copy Expression
 
-(declare (usual-integrations))
-(declare (open-block-optimizations))
-(declare (eta-substitution))
-(declare (automagic-integrations))
+(declare (usual-integrations)
+        (open-block-optimizations)
+        (eta-substitution)
+        (automagic-integrations)
+        (integrate-external "object" "mvalue"))
 \f
 (define root-block)
 

diff --git a/v7/src/sf/emodel.scm b/v7/src/sf/emodel.scm
index df78dfd25208bc1e0a280e22d281ed3c14022212..02958a85304739fc1d2f4d1eef0bbaa155e8b18d 100644 (file)
--- a/v7/src/sf/emodel.scm
+++ b/v7/src/sf/emodel.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/sf/emodel.scm,v 3.4 1988/03/22 17:36:18 jrm Rel $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/sf/emodel.scm,v 3.5 1988/04/23 08:50:22 cph Exp $
 
 Copyright (c) 1987 Massachusetts Institute of Technology
 
@@ -34,7 +34,8 @@ MIT in each case. |#
 
 ;;;; SCode Optimizer: Environment Model
 
-(declare (usual-integrations))
+(declare (usual-integrations)
+        (integrate-external "object"))
 \f
 (define variable/assoc
   (association-procedure eq? variable/name))

diff --git a/v7/src/sf/free.scm b/v7/src/sf/free.scm
index 8e2cf4aef18412e892de7611e208cdf72b5ef312..fd54547fd5e9567d38587083e61325e46e0de3a7 100644 (file)
--- a/v7/src/sf/free.scm
+++ b/v7/src/sf/free.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/sf/free.scm,v 3.3 1988/03/22 17:36:49 jrm Rel $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/sf/free.scm,v 3.4 1988/04/23 08:50:35 cph Exp $
 
-Copyright (c) 1987 Massachusetts Institute of Technology
+Copyright (c) 1988 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -34,12 +34,12 @@ MIT in each case. |#
 
 ;;;; SCode Optimizer: Free Variable Analysis
 
-(declare (usual-integrations))
-(declare (automagic-integrations))
-(declare (open-block-optimizations))
-(declare (eta-substitution))
+(declare (usual-integrations)
+        (automagic-integrations)
+        (open-block-optimizations)
+        (eta-substitution)
+        (integrate-external "object" "lsets"))
 \f
-
 (declare (integrate-operator no-free-variables singleton-variable
                             list->variable-set))
 

diff --git a/v7/src/sf/pardec.scm b/v7/src/sf/pardec.scm
index 96a256f38f0228213e6cc4016e3a36e6ce9d623a..b3fccffc76717ba27ce895bce189c438bb819f31 100644 (file)
--- a/v7/src/sf/pardec.scm
+++ b/v7/src/sf/pardec.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/sf/pardec.scm,v 3.6 1988/03/22 17:38:09 jrm Rel $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/sf/pardec.scm,v 3.7 1988/04/23 08:50:50 cph Exp $
 
-Copyright (c) 1987 Massachusetts Institute of Technology
+Copyright (c) 1988 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -34,10 +34,11 @@ MIT in each case. |#
 
 ;;;; SCode Optimizer: Parse Declarations
 
-(declare (usual-integrations))
-(declare (open-block-optimizations))
-(declare (automagic-integrations))
-(declare (eta-substitution))
+(declare (usual-integrations)
+        (open-block-optimizations)
+        (automagic-integrations)
+        (eta-substitution)
+        (integrate-external "object" "mvalue"))
 \f
 (define (declarations/make-null)
   (declarations/make '() '() '()))

diff --git a/v7/src/sf/subst.scm b/v7/src/sf/subst.scm
index 9fd29b45dc77012f4037dfbcc8e520e7952eaacd..a0d11d31d28652d947112c7ca14cda1699963151 100644 (file)
--- a/v7/src/sf/subst.scm
+++ b/v7/src/sf/subst.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/sf/subst.scm,v 3.8 1988/03/22 21:10:18 jrm Rel $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/sf/subst.scm,v 3.9 1988/04/23 08:51:21 cph Exp $
 
-Copyright (c) 1987 Massachusetts Institute of Technology
+Copyright (c) 1988 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -34,9 +34,10 @@ MIT in each case. |#
 
 ;;;; SCode Optimizer: Beta Substitution
 
-(declare (usual-integrations))
-(declare (eta-substitution))
-(declare (open-block-optimizations))
+(declare (usual-integrations)
+        (eta-substitution)
+        (open-block-optimizations)
+        (integrate-external "object" "mvalue" "lsets"))
 \f
 
 (using-syntax sf-syntax-table

diff --git a/v7/src/sf/tables.scm b/v7/src/sf/tables.scm
index dc499f37860fcbfa5eb9e6648f9e77d1a8421ec7..e0495f861522c4d02df02cc05abb4dfdc96bbef3 100644 (file)
--- a/v7/src/sf/tables.scm
+++ b/v7/src/sf/tables.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/sf/tables.scm,v 3.2 1988/03/22 17:40:04 jrm Rel $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/sf/tables.scm,v 3.3 1988/04/23 08:51:46 cph Exp $
 
 Copyright (c) 1987 Massachusetts Institute of Technology
 
@@ -34,8 +34,8 @@ MIT in each case. |#
 
 ;;;; SCode Optimizer: Tables
 
-(declare (usual-integrations))
-(declare (automagic-integrations))
+(declare (usual-integrations)
+        (integrate-external "object"))
 \f
 ;;;; Operations
 

diff --git a/v7/src/sf/toplev.scm b/v7/src/sf/toplev.scm
index 4d15a558f3a363c4b169ec4449c3f1e67a4b2b94..8efd8f895fa307eec61d823e1a4d39b0344c37f5 100644 (file)
--- a/v7/src/sf/toplev.scm
+++ b/v7/src/sf/toplev.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/sf/toplev.scm,v 3.10 1988/04/23 08:24:45 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/sf/toplev.scm,v 3.11 1988/04/23 08:52:00 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -34,9 +34,10 @@ MIT in each case. |#
 
 ;;;; SCode Optimizer: Top Level
 
-(declare (usual-integrations))
-(declare (automagic-integrations))
-(declare (open-block-optimizations))
+(declare (usual-integrations)
+        (automagic-integrations)
+        (open-block-optimizations)
+        (integrate-external "mvalue"))
 \f
 ;;;; User Interface
 

diff --git a/v7/src/sf/usicon.scm b/v7/src/sf/usicon.scm
index f91f301debf15d6739c7321e517d2e727fe69051..e0042edf579c4051d91d04fdc0fa75c464d46fea 100644 (file)
--- a/v7/src/sf/usicon.scm
+++ b/v7/src/sf/usicon.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/sf/usicon.scm,v 3.3 1988/03/22 17:40:30 jrm Rel $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/sf/usicon.scm,v 3.4 1988/04/23 08:52:19 cph Exp $
 
 Copyright (c) 1987 Massachusetts Institute of Technology
 
@@ -34,8 +34,8 @@ MIT in each case. |#
 
 ;;;; SCode Optimizer: Usual Integrations: Constants
 
-(declare (usual-integrations))
-(declare (automagic-integrations))
+(declare (usual-integrations)
+        (integrate-external "object" "mvalue"))
 \f
 (define usual-integrations/constant-names)
 (define usual-integrations/constant-values)

diff --git a/v7/src/sf/usiexp.scm b/v7/src/sf/usiexp.scm
index b75a593fc2518819eb22b4479fb74a486d5e7d03..88bdb32c01fc186151d057c324bea342cc0ba8e7 100644 (file)
--- a/v7/src/sf/usiexp.scm
+++ b/v7/src/sf/usiexp.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/sf/usiexp.scm,v 3.6 1988/03/22 17:40:40 jrm Rel $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/sf/usiexp.scm,v 3.7 1988/04/23 08:52:33 cph Exp $
 
-Copyright (c) 1987 Massachusetts Institute of Technology
+Copyright (c) 1988 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -34,10 +34,11 @@ MIT in each case. |#
 
 ;;;; SCode Optimizer: Usual Integrations: Combination Expansions
 
-(declare (usual-integrations))
-(declare (automagic-integrations))
-(declare (open-block-optimizations))
-(declare (eta-substitution))
+(declare (usual-integrations)
+        (automagic-integrations)
+        (open-block-optimizations)
+        (eta-substitution)
+        (integrate-external "object"))
 \f
 ;;;; N-ary Arithmetic Predicates
 

diff --git a/v7/src/sf/xform.scm b/v7/src/sf/xform.scm
index c9e89eb3da6d3db0a009ba8353d26efd07da1642..eba49719fdc440a59414a015feae9462c2e420aa 100644 (file)
--- a/v7/src/sf/xform.scm
+++ b/v7/src/sf/xform.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/sf/xform.scm,v 3.7 1988/03/25 20:48:02 cph Rel $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/sf/xform.scm,v 3.8 1988/04/23 08:55:34 cph Exp $
 
-Copyright (c) 1987 Massachusetts Institute of Technology
+Copyright (c) 1988 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -34,10 +34,11 @@ MIT in each case. |#
 
 ;;;; SCode Optimizer: Transform Input Expression
 
-(declare (usual-integrations))
-(declare (eta-substitution))
-(declare (automagic-integrations))
-(declare (open-block-optimizations))
+(declare (usual-integrations)
+        (eta-substitution)
+        (automagic-integrations)
+        (open-block-optimizations)
+        (integrate-external "object" "mvalue"))
 \f
 ;;; GLOBAL-BLOCK is used to handle (USUAL-INTEGRATIONS), as follows.
 ;;; This declaration refers to a large group of names, which are

diff --git a/v8/src/sf/toplev.scm b/v8/src/sf/toplev.scm
index fd38490eb2e1246abed42562c5309c07e72774f8..86719228b816d8816152d5bcff8b07e8c8adf074 100644 (file)
--- a/v8/src/sf/toplev.scm
+++ b/v8/src/sf/toplev.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/sf/toplev.scm,v 3.10 1988/04/23 08:24:45 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/sf/toplev.scm,v 3.11 1988/04/23 08:52:00 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -34,9 +34,10 @@ MIT in each case. |#
 
 ;;;; SCode Optimizer: Top Level
 
-(declare (usual-integrations))
-(declare (automagic-integrations))
-(declare (open-block-optimizations))
+(declare (usual-integrations)
+        (automagic-integrations)
+        (open-block-optimizations)
+        (integrate-external "mvalue"))
 \f
 ;;;; User Interface