Fix bugs in fggen/{canon,fggen}.scm introduced when

compiler:compile-by-procedure? was added.

diff --git a/v7/src/compiler/fggen/canon.scm b/v7/src/compiler/fggen/canon.scm
index f15ead5a26447f6fbf2ffb136379a2bdadfba024..225e9e03e3800a5f381d3f5b8a6890f4fffdd5ac 100644 (file)
--- a/v7/src/compiler/fggen/canon.scm
+++ b/v7/src/compiler/fggen/canon.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/fggen/canon.scm,v 1.6 1989/08/21 19:33:57 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/fggen/canon.scm,v 1.7 1989/09/13 20:44:17 jinx Exp $
 
 Copyright (c) 1988, 1989 Massachusetts Institute of Technology
 
@@ -455,8 +455,9 @@ ARBITRARY:  The expression may be executed more than once.  It
       (ucode-primitive SCODE-EVAL)
       (list (let ((nexp
                   (scode/make-directive
+                   (scode/make-quotation exp)
                    '(COMPILE)
-                   (scode/make-quotation exp)              original-expression)))
+                   original-expression)))
              (if arbitrary?
                  (scode/make-combination
                   (scode/make-absolute-reference 'COPY-PROGRAM)

diff --git a/v7/src/compiler/fggen/fggen.scm b/v7/src/compiler/fggen/fggen.scm
index a835b8fec22c6808e000ce71e1d4be0afb32242b..444a81b6cb4d705ff32af88af68e75a25e3a91c1 100644 (file)
--- a/v7/src/compiler/fggen/fggen.scm
+++ b/v7/src/compiler/fggen/fggen.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/fggen/fggen.scm,v 4.19 1989/08/21 19:34:01 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/fggen/fggen.scm,v 4.20 1989/09/13 20:44:32 jinx Exp $
 
 Copyright (c) 1988, 1989 Massachusetts Institute of Technology
 
@@ -717,9 +717,11 @@ MIT in each case. |#
            (if (not (scode/quotation? expression))
                (error "Bad compile directive" comment))
            (continue/rvalue-constant block continuation
-            (make-constant
-             (compile-recursively
-              (scode/quotation-expression expression false)))))           ((COMPILE-PROCEDURE)
+                                     (make-constant
+                                      (compile-recursively
+                                       (scode/quotation-expression expression)
+                                       false))))
+          ((COMPILE-PROCEDURE)
            (if (not (scode/lambda? expression))
                (error "Bad compile-procedure directive" comment))
            (continue/rvalue-constant block continuation

diff --git a/v7/src/compiler/machines/bobcat/make.scm-68040 b/v7/src/compiler/machines/bobcat/make.scm-68040
index d0e85541a45a6975dd0cf45b42664b91710cd185..290fc58270af4c2cd6f5eefe36aa6ec9bb3358e9 100644 (file)
--- a/v7/src/compiler/machines/bobcat/make.scm-68040
+++ b/v7/src/compiler/machines/bobcat/make.scm-68040
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/bobcat/make.scm-68040,v 4.50 1989/08/28 18:34:09 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/bobcat/make.scm-68040,v 4.51 1989/09/13 20:44:01 jinx Exp $
 
 Copyright (c) 1988, 1989 Massachusetts Institute of Technology
 
@@ -41,4 +41,4 @@ MIT in each case. |#
            ((package/reference (find-package name) 'INITIALIZE-PACKAGE!)))
          '((COMPILER MACROS)
            (COMPILER DECLARATIONS)))
-(add-system! (make-system "Liar (Motorola MC68020)" 4 50 '()))
\ No newline at end of file
+(add-system! (make-system "Liar (Motorola MC68020)" 4 51 '()))
\ No newline at end of file