From bd24ea895091492ceb292c0ee859eba94c6ab6c8 Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Fri, 6 Jan 1995 19:18:39 +0000 Subject: [PATCH] Merge in #F/() bug fix from split code. --- v7/src/sf/reduct.scm | 9 ++++----- v7/src/sf/table.scm | 8 ++++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/v7/src/sf/reduct.scm b/v7/src/sf/reduct.scm index 8f54cde2a..9c83785bd 100644 --- 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 9bfa79bdb..3cafa421e 100644 --- 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)))) -- 2.25.1