From 91989854826f060fe51bcb6720b7f0d59cebbce4 Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Sat, 23 Apr 1988 08:55:34 +0000 Subject: [PATCH] Move all `integrate-external' declarations into the files, using relative pathnames. --- v7/src/sf/cgen.scm | 13 +++++++------ v7/src/sf/chtype.scm | 9 +++++---- v7/src/sf/copy.scm | 13 +++++++------ v7/src/sf/emodel.scm | 5 +++-- v7/src/sf/free.scm | 14 +++++++------- v7/src/sf/pardec.scm | 13 +++++++------ v7/src/sf/subst.scm | 11 ++++++----- v7/src/sf/tables.scm | 6 +++--- v7/src/sf/toplev.scm | 9 +++++---- v7/src/sf/usicon.scm | 6 +++--- v7/src/sf/usiexp.scm | 13 +++++++------ v7/src/sf/xform.scm | 13 +++++++------ v8/src/sf/toplev.scm | 9 +++++---- 13 files changed, 72 insertions(+), 62 deletions(-) diff --git a/v7/src/sf/cgen.scm b/v7/src/sf/cgen.scm index 6e4ff09f3..4fd5847a4 100644 --- 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")) (define (cgen/external quotation) (fluid-let ((flush-declarations? true)) diff --git a/v7/src/sf/chtype.scm b/v7/src/sf/chtype.scm index c992c1e60..727c9b1a5 100644 --- 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")) (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 3dab4ae0d..e3ee471b4 100644 --- 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")) (define root-block) diff --git a/v7/src/sf/emodel.scm b/v7/src/sf/emodel.scm index df78dfd25..02958a853 100644 --- 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")) (define variable/assoc (association-procedure eq? variable/name)) diff --git a/v7/src/sf/free.scm b/v7/src/sf/free.scm index 8e2cf4aef..fd54547fd 100644 --- 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")) - (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 96a256f38..b3fccffc7 100644 --- 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")) (define (declarations/make-null) (declarations/make '() '() '())) diff --git a/v7/src/sf/subst.scm b/v7/src/sf/subst.scm index 9fd29b45d..a0d11d31d 100644 --- 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")) (using-syntax sf-syntax-table diff --git a/v7/src/sf/tables.scm b/v7/src/sf/tables.scm index dc499f378..e0495f861 100644 --- 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")) ;;;; Operations diff --git a/v7/src/sf/toplev.scm b/v7/src/sf/toplev.scm index 4d15a558f..8efd8f895 100644 --- 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")) ;;;; User Interface diff --git a/v7/src/sf/usicon.scm b/v7/src/sf/usicon.scm index f91f301de..e0042edf5 100644 --- 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")) (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 b75a593fc..88bdb32c0 100644 --- 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")) ;;;; N-ary Arithmetic Predicates diff --git a/v7/src/sf/xform.scm b/v7/src/sf/xform.scm index c9e89eb3d..eba49719f 100644 --- 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")) ;;; 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 fd38490eb..86719228b 100644 --- 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")) ;;;; User Interface -- 2.25.1