Merge in #F/() bug fix from split code.

diff --git a/v7/src/sf/reduct.scm b/v7/src/sf/reduct.scm
index 8f54cde2af13497c6d5f5a48fc3f389e42aac8f2..9c83785bded79edb878127f3ab4b8a6e8c3e8066 100644 (file)
--- a/v7/src/sf/reduct.scm
+++ b/v7/src/sf/reduct.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: reduct.scm,v 4.8 1993/09/01 00:10:25 cph Exp $
+$Id: reduct.scm,v 4.9 1995/01/06 19:16:36 cph Exp $
 
-Copyright (c) 1988-1993 Massachusetts Institute of Technology
+Copyright (c) 1988-95 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -379,9 +379,8 @@ Examples:
        '()
        (cons
         (let ((place (assq (car keys) options)))
-          (if (not place)
-              '()
-              (cdr place)))
+          (and place
+               (cdr place)))
         (collect (cdr keys)))))
 
   (define (check opts)

diff --git a/v7/src/sf/table.scm b/v7/src/sf/table.scm
index 9bfa79bdb3d1264ff9cb43d4b68f88c4c648fe5b..3cafa421e9488a03a95f939443698538c84971ab 100644 (file)
--- a/v7/src/sf/table.scm
+++ b/v7/src/sf/table.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: table.scm,v 4.3 1993/11/20 07:11:46 cph Exp $
+$Id: table.scm,v 4.4 1995/01/06 19:18:39 cph Exp $
 
-Copyright (c) 1988-93 Massachusetts Institute of Technology
+COPYRIGHT (c) 1988-95 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -112,13 +112,13 @@ MIT in each case. |#
 
     (define (get key if-found if-not-found)
       (let ((entry (lookup key)))
-       (if (null? entry)
+       (if (not entry)
            (if-not-found)
            (if-found (entry-value entry)))))
 
     (define (put! key value)
       (let ((entry (lookup key)))
-       (if (null? entry)
+       (if (not entry)
            (extend-table! (make-entry key value))
            (set-entry-value! entry value))))