Fix bugs in reduction declarations.

diff --git a/v7/src/sf/make.scm b/v7/src/sf/make.scm
index 79ba668a8e8d1aa1cb9ee634aca8eb258d046c7c..89119608a58cd5a5eb7d2a2fd649dd821873fef3 100644 (file)
--- a/v7/src/sf/make.scm
+++ b/v7/src/sf/make.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/sf/make.scm,v 4.17 1991/05/06 18:46:39 jinx Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/sf/make.scm,v 4.18 1991/07/19 03:46:14 cph Exp $
 
 Copyright (c) 1988-91 Massachusetts Institute of Technology
 
@@ -39,4 +39,4 @@ MIT in each case. |#
 (package/system-loader "sf" '() 'QUERY)
 ((package/reference (find-package '(SCODE-OPTIMIZER))
                    'USUAL-INTEGRATIONS/CACHE!))
-(add-system! (make-system "SF" 4 17 '()))
\ No newline at end of file
+(add-system! (make-system "SF" 4 18 '()))
\ No newline at end of file

diff --git a/v7/src/sf/reduct.scm b/v7/src/sf/reduct.scm
index e21b897b655fc474e6ec9e7d8efa1c40c8a0ea5b..c8ec9fcca916642ed092b8a535154b2c7f03446b 100644 (file)
--- a/v7/src/sf/reduct.scm
+++ b/v7/src/sf/reduct.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/sf/reduct.scm,v 4.1 1988/06/13 12:30:09 cph Rel $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/sf/reduct.scm,v 4.2 1991/07/19 03:45:52 cph Exp $
 
-Copyright (c) 1988 Massachusetts Institute of Technology
+Copyright (c) 1988-91 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -276,7 +276,11 @@ Examples:
               (cond ((null? l)
                      (none block))
                     ((null? (cdr l))
-                     (wrap block (single (car l) binop)))
+                     (wrap block
+                           (single block
+                                   (car l)
+                                   (lambda (x y)
+                                     (binop block x y)))))
                     (else
                      (wrap block (binop block (car l)
                                         (group (cdr l)))))))))))))
@@ -326,7 +330,7 @@ Examples:
 
   (check options)
   (apply receiver (collect keywords)))
-\f
+
 ;;;; Error and indentation utilities
 
 (define (fail name value)
@@ -405,7 +409,7 @@ Examples:
                                        single-combiner null))
                               (else
                                (fail 'NULL-VALUE null-value)))))))))))
-\f
+
          (cond ((not group)
                 (make-reducer-internal group-right))
                ((not (null? (cdr group)))

diff --git a/v8/src/sf/make.scm b/v8/src/sf/make.scm
index 3be1ebee7c79a1f01b9f3c2eb2c2bd61912f088d..05219966f61d69670168e65db647d053ffca1563 100644 (file)
--- a/v8/src/sf/make.scm
+++ b/v8/src/sf/make.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/sf/make.scm,v 4.17 1991/05/06 18:46:39 jinx Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/sf/make.scm,v 4.18 1991/07/19 03:46:14 cph Exp $
 
 Copyright (c) 1988-91 Massachusetts Institute of Technology
 
@@ -39,4 +39,4 @@ MIT in each case. |#
 (package/system-loader "sf" '() 'QUERY)
 ((package/reference (find-package '(SCODE-OPTIMIZER))
                    'USUAL-INTEGRATIONS/CACHE!))
-(add-system! (make-system "SF" 4 17 '()))
\ No newline at end of file
+(add-system! (make-system "SF" 4 18 '()))
\ No newline at end of file