From: Chris Hanson <org/chris-hanson/cph>
Date: Wed, 17 Nov 2004 05:24:31 +0000 (+0000)
Subject: Don't define the standard membership/association procedures in terms
X-Git-Tag: 20090517-FFI~1478
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=3bd1152cdc13e7bae7d455022f5c71a179244fd5;p=mit-scheme.git

Don't define the standard membership/association procedures in terms
of the generic ones.
---

diff --git a/v7/src/runtime/list.scm b/v7/src/runtime/list.scm
index a83000c0e..6c0768467 100644
--- a/v7/src/runtime/list.scm
+++ b/v7/src/runtime/list.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: list.scm,v 14.40 2004/11/17 04:42:31 cph Exp $
+$Id: list.scm,v 14.41 2004/11/17 05:24:11 cph Exp $
 
 Copyright 1986,1987,1988,1989,1990,1991 Massachusetts Institute of Technology
 Copyright 1992,1993,1994,1995,1996,2000 Massachusetts Institute of Technology
@@ -143,16 +143,6 @@ USA.
   (if (not (list-of-type? object predicate))
       (error:wrong-type-argument object description caller)))
 
-(define (alist? object)
-  (list-of-type? object pair?))
-
-(define (guarantee-alist object caller)
-  (if (not (alist? object))
-      (error:not-alist object caller)))
-
-(define (error:not-alist object caller)
-  (error:wrong-type-argument object "association list" caller))
-
 (define (list?->length object)
   (let loop ((l1 object) (l2 object) (length 0))
     (if (pair? l1)
@@ -237,26 +227,6 @@ USA.
 	  ((null? items) items)
 	  (else (lose)))))
 
-(define (alist-copy alist)
-  (let ((lose (lambda () (error:not-alist alist 'ALIST-COPY))))
-    (cond ((pair? alist)
-	   (if (pair? (car alist))
-	       (let ((head (cons (car alist) '())))
-		 (let loop ((alist (cdr alist)) (previous head))
-		   (cond ((pair? alist)
-			  (if (pair? (car alist))
-			      (let ((new
-				     (cons (cons (caar alist) (cdar alist))
-					   '())))
-				(set-cdr! previous new)
-				(loop (cdr alist) new))
-			      (lose)))
-			 ((not (null? alist)) (lose))))
-		 head)
-	       (lose)))
-	  ((null? alist) alist)
-	  (else (lose)))))
-
 (define (tree-copy tree)
   (let walk ((tree tree))
     (if (pair? tree)
@@ -697,7 +667,29 @@ USA.
 	      (error:not-list a-list 'FOLD-RIGHT))
 	  initial-value))))
 
-;;;; Generalized List Operations
+;;;; Generalized list operations
+
+(define (find-matching-item items predicate)
+  (let loop ((items* items))
+    (if (pair? items*)
+	(if (predicate (car items*))
+	    (car items*)
+	    (loop (cdr items*)))
+	(begin
+	  (if (not (null? items*))
+	      (error:not-list items 'FIND-MATCHING-ITEM))
+	  #f))))
+
+(define (find-non-matching-item items predicate)
+  (let loop ((items* items))
+    (if (pair? items*)
+	(if (predicate (car items*))
+	    (loop (cdr items*))
+	    (car items*))
+	(begin
+	  (if (not (null? items*))
+	      (error:not-list items 'FIND-MATCHING-ITEM))
+	  #f))))
 
 (define (keep-matching-items items predicate)
   (let ((lose (lambda () (error:not-list items 'KEEP-MATCHING-ITEMS))))
@@ -734,28 +726,6 @@ USA.
 		 head)))
 	  ((null? items) items)
 	  (else (lose)))))
-
-(define (find-matching-item items predicate)
-  (let loop ((items* items))
-    (if (pair? items*)
-	(if (predicate (car items*))
-	    (car items*)
-	    (loop (cdr items*)))
-	(begin
-	  (if (not (null? items*))
-	      (error:not-list items 'FIND-MATCHING-ITEM))
-	  #f))))
-
-(define (find-non-matching-item items predicate)
-  (let loop ((items* items))
-    (if (pair? items*)
-	(if (predicate (car items*))
-	    (loop (cdr items*))
-	    (car items*))
-	(begin
-	  (if (not (null? items*))
-	      (error:not-list items 'FIND-MATCHING-ITEM))
-	  #f))))
 
 (define (delete-matching-items! items predicate)
   (letrec
@@ -817,146 +787,217 @@ USA.
 (define ((list-deletor! predicate) items)
   (delete-matching-items! items predicate))
 
-;;;; Membership/Association Lists
-
-(define (initialize-package!)
-  (set! memv (member-procedure eqv?))
-  (set! member (member-procedure equal?))
-  (set! delv (delete-member-procedure list-deletor eqv?))
-  (set! delete (delete-member-procedure list-deletor equal?))
-  (set! delv! (delete-member-procedure list-deletor! eqv?))
-  (set! delete! (delete-member-procedure list-deletor! equal?))
-  (set! assv (association-procedure eqv? car))
-  (set! assoc (association-procedure equal? car))
-  (set! del-assq (delete-association-procedure list-deletor eq? car))
-  (set! del-assv (delete-association-procedure list-deletor eqv? car))
-  (set! del-assoc (delete-association-procedure list-deletor equal? car))
-  (set! del-assq! (delete-association-procedure list-deletor! eq? car))
-  (set! del-assv! (delete-association-procedure list-deletor! eqv? car))
-  (set! del-assoc! (delete-association-procedure list-deletor! equal? car))
-  unspecific)
-
-(define memv)
-(define member)
-(define delv)
-(define delete)
-(define delv!)
-(define delete!)
-(define assv)
-(define assoc)
-(define del-assq)
-(define del-assv)
-(define del-assoc)
-(define del-assq!)
-(define del-assv!)
-(define del-assoc!)
-
-(define (member-procedure predicate)
-  (lambda (item items)
-    (let loop ((items* items))
-      (if (pair? items*)
-	  (if (predicate (car items*) item)
-	      items*
-	      (loop (cdr items*)))
-	  (begin
-	    (if (not (null? items*))
-		(error:not-list items #f))
-	    #f)))))
+;;;; Membership lists
+
+(define-syntax define-fast-member
+  (sc-macro-transformer
+   (lambda (form environment)
+     (if (syntax-match? '(SYMBOL IDENTIFIER) (cdr form))
+	 (let ((name (cadr form))
+	       (predicate (close-syntax (caddr form) environment)))
+	   `(DEFINE (,name ITEM ITEMS)
+	      (LET LOOP ((ITEMS* ITEMS))
+		(IF (PAIR? ITEMS*)
+		    (IF (,predicate (CAR ITEMS*) ITEM)
+			ITEMS*
+			(LOOP (CDR ITEMS*)))
+		    (BEGIN
+		      (IF (NOT (NULL? ITEMS*))
+			  (ERROR:NOT-LIST ITEMS ',name))
+		      #F)))))
+	 (ill-formed-syntax form)))))
+
+(define-fast-member memq eq?)
+(define-fast-member memv eqv?)
+(define-fast-member member equal?)
+
+(define-syntax define-fast-delete-member
+  (sc-macro-transformer
+   (lambda (form environment)
+     (if (syntax-match? '(SYMBOL IDENTIFIER) (cdr form))
+	 (let ((name (cadr form))
+	       (predicate (close-syntax (caddr form) environment)))
+	   `(DEFINE (,name ITEM ITEMS)
+	      (LET ((LOSE (LAMBDA () (ERROR:NOT-LIST ITEMS ',name))))
+		(COND ((PAIR? ITEMS)
+		       (LET ((HEAD (CONS (CAR ITEMS) '())))
+			 (LET LOOP ((ITEMS (CDR ITEMS)) (PREVIOUS HEAD))
+			   (COND ((PAIR? ITEMS)
+				  (IF (,predicate (CAR ITEMS) ITEM)
+				      (LOOP (CDR ITEMS) PREVIOUS)
+				      (LET ((NEW (CONS (CAR ITEMS) '())))
+					(SET-CDR! PREVIOUS NEW)
+					(LOOP (CDR ITEMS) NEW))))
+				 ((NOT (NULL? ITEMS)) (LOSE))))
+			 (IF (,predicate (CAR ITEMS) ITEM)
+			     (CDR HEAD)
+			     HEAD)))
+		      ((NULL? ITEMS) ITEMS)
+		      (ELSE (LOSE))))))
+	 (ill-formed-syntax form)))))
+
+(define-fast-delete-member delq eq?)
+(define-fast-delete-member delv eqv?)
+(define-fast-delete-member delete equal?)
+
+(define-syntax define-fast-delete-member!
+  (sc-macro-transformer
+   (lambda (form environment)
+     (if (syntax-match? '(SYMBOL IDENTIFIER) (cdr form))
+	 (let ((name (cadr form))
+	       (predicate (close-syntax (caddr form) environment)))
+	   `(DEFINE (,name ITEM ITEMS)
+	      (LETREC
+		  ((TRIM-INITIAL-SEGMENT
+		    (LAMBDA (ITEMS*)
+		      (IF (PAIR? ITEMS*)
+			  (IF (,predicate ITEM (CAR ITEMS*))
+			      (TRIM-INITIAL-SEGMENT (CDR ITEMS*))
+			      (BEGIN
+				(LOCATE-INITIAL-SEGMENT ITEMS* (CDR ITEMS*))
+				ITEMS*))
+			  (BEGIN
+			    (IF (NOT (NULL? ITEMS*))
+				(ERROR:NOT-LIST ITEMS ',name))
+			    '()))))
+		   (LOCATE-INITIAL-SEGMENT
+		    (LAMBDA (LAST THIS)
+		      (IF (PAIR? THIS)
+			  (IF (,predicate ITEM (CAR THIS))
+			      (SET-CDR! LAST (TRIM-INITIAL-SEGMENT (CDR THIS)))
+			      (LOCATE-INITIAL-SEGMENT THIS (CDR THIS)))
+			  (IF (NOT (NULL? THIS))
+			      (ERROR:NOT-LIST ITEMS ',name))))))
+		(TRIM-INITIAL-SEGMENT ITEMS))))
+	 (ill-formed-syntax form)))))
+
+(define-fast-delete-member! delq! eq?)
+(define-fast-delete-member! delv! eqv?)
+(define-fast-delete-member! delete! equal?)
+
+;;;; Association lists
 
-(define (add-member-procedure predicate)
-  (let ((member (member-procedure predicate)))
-    (lambda (item items)
-      (if (member item items)
-	  items
-	  (cons item items)))))
+(define (alist? object)
+  (list-of-type? object pair?))
 
-(define ((delete-member-procedure deletor predicate) item items)
-  ((deletor (lambda (match) (predicate match item))) items))
+(define (guarantee-alist object caller)
+  (if (not (alist? object))
+      (error:not-alist object caller)))
 
-(define (association-procedure predicate selector)
-  (lambda (key items)
-    (let loop ((items* items))
-      (if (pair? items*)
-	  (if (predicate (selector (car items*)) key)
-	      (car items*)
-	      (loop (cdr items*)))
-	  (begin
-	    (if (not (null? items*))
-		(error:not-list items #f))
-	    #f)))))
+(define (error:not-alist object caller)
+  (error:wrong-type-argument object "association list" caller))
 
-(define ((delete-association-procedure deletor predicate selector) key alist)
-  ((deletor (lambda (entry) (predicate (selector entry) key))) alist))
+(define-syntax define-fast-assoc
+  (sc-macro-transformer
+   (lambda (form environment)
+     (if (syntax-match? '(SYMBOL IDENTIFIER) (cdr form))
+	 (let ((name (cadr form))
+	       (predicate (close-syntax (caddr form) environment)))
+	   `(DEFINE (,name KEY ALIST)
+	      (LET LOOP ((ALIST* ALIST))
+		(IF (PAIR? ALIST*)
+		    (BEGIN
+		      (IF (NOT (PAIR? (CAR ALIST*)))
+			  (ERROR:NOT-ALIST ALIST ',name))
+		      (IF (,predicate (CAR (CAR ALIST*)) KEY)
+			  (CAR ALIST*)
+			  (LOOP (CDR ALIST*))))
+		    (BEGIN
+		      (IF (NOT (NULL? ALIST*))
+			  (ERROR:NOT-ALIST ALIST ',name))
+		      #F)))))
+	 (ill-formed-syntax form)))))
+
+(define-fast-assoc assq eq?)
+(define-fast-assoc assv eqv?)
+(define-fast-assoc assoc equal?)
+
+(define-syntax define-fast-del-assoc
+  (sc-macro-transformer
+   (lambda (form environment)
+     (if (syntax-match? '(SYMBOL IDENTIFIER) (cdr form))
+	 (let ((name (cadr form))
+	       (predicate (close-syntax (caddr form) environment)))
+	   `(DEFINE (,name ITEM ITEMS)
+	      (LET ((LOSE (LAMBDA () (ERROR:NOT-LIST ITEMS ',name))))
+		(COND ((PAIR? ITEMS)
+		       (LET ((HEAD (CONS (CAR ITEMS) '())))
+			 (LET LOOP ((ITEMS* (CDR ITEMS)) (PREVIOUS HEAD))
+			   (COND ((PAIR? ITEMS*)
+				  (IF (,predicate (CAR ITEMS*) ITEM)
+				      (LOOP (CDR ITEMS*) PREVIOUS)
+				      (LET ((NEW (CONS (CAR ITEMS*) '())))
+					(SET-CDR! PREVIOUS NEW)
+					(LOOP (CDR ITEMS*) NEW))))
+				 ((NOT (NULL? ITEMS*)) (LOSE))))
+			 (IF (,predicate (CAR ITEMS) ITEM)
+			     (CDR HEAD)
+			     HEAD)))
+		      ((NULL? ITEMS) ITEMS)
+		      (ELSE (LOSE))))))
+	 (ill-formed-syntax form)))))
+
+(define-fast-del-assoc del-assq eq?)
+(define-fast-del-assoc del-assv eqv?)
+(define-fast-del-assoc del-assoc equal?)
 
-;;; The following could be defined using the generic procedures above,
-;;; but the compiler produces better code for them this way.  The only
-;;; reason to use these procedures is speed, so we crank them up.
-
-(define (memq item items)
-  (let loop ((items* items))
-    (if (pair? items*)
-	(if (eq? (car items*) item)
-	    items*
-	    (loop (cdr items*)))
-	(begin
-	  (if (not (null? items*))
-	      (error:not-list items 'MEMQ))
-	  #f))))
-
-(define (assq key alist)
-  (let loop ((alist* alist))
-    (if (pair? alist*)
-	(begin
-	  (if (not (pair? (car alist*)))
-	      (error:not-alist alist 'ASSQ))
-	  (if (eq? (car (car alist*)) key)
-	      (car alist*)
-	      (loop (cdr alist*))))
-	(begin
-	  (if (not (null? alist*))
-	      (error:not-alist alist 'ASSQ))
-	  #f))))
+(define-syntax define-fast-del-assoc!
+  (sc-macro-transformer
+   (lambda (form environment)
+     (if (syntax-match? '(SYMBOL IDENTIFIER) (cdr form))
+	 (let ((name (cadr form))
+	       (predicate (close-syntax (caddr form) environment)))
+	   `(DEFINE (,name ITEM ITEMS)
+	      (LETREC
+		  ((TRIM-INITIAL-SEGMENT
+		    (LAMBDA (ITEMS*)
+		      (IF (PAIR? ITEMS*)
+			  (IF (,predicate (CAR ITEMS*) ITEM)
+			      (TRIM-INITIAL-SEGMENT (CDR ITEMS*))
+			      (BEGIN
+				(LOCATE-INITIAL-SEGMENT ITEMS* (CDR ITEMS*))
+				ITEMS*))
+			  (BEGIN
+			    (IF (NOT (NULL? ITEMS*))
+				(LOSE))
+			    '()))))
+		   (LOCATE-INITIAL-SEGMENT
+		    (LAMBDA (LAST THIS)
+		      (IF (PAIR? THIS)
+			  (IF (,predicate (CAR THIS) ITEM)
+			      (SET-CDR! LAST (TRIM-INITIAL-SEGMENT (CDR THIS)))
+			      (LOCATE-INITIAL-SEGMENT THIS (CDR THIS)))
+			  (IF (NOT (NULL? THIS))
+			      (LOSE)))))
+		   (LOSE
+		    (LAMBDA ()
+		      (ERROR:NOT-LIST ITEMS ',name))))
+		(TRIM-INITIAL-SEGMENT ITEMS))))
+	 (ill-formed-syntax form)))))
+
+(define-fast-del-assoc! del-assq! eq?)
+(define-fast-del-assoc! del-assv! eqv?)
+(define-fast-del-assoc! del-assoc! equal?)
 
-(define (delq item items)
-  (let ((lose (lambda () (error:not-list items 'DELQ))))
-    (cond ((pair? items)
-	   (let ((head (cons (car items) '())))
-	     (let loop ((items (cdr items)) (previous head))
-	       (cond ((pair? items)
-		      (if (eq? item (car items))
-			  (loop (cdr items) previous)
-			  (let ((new (cons (car items) '())))
-			    (set-cdr! previous new)
-			    (loop (cdr items) new))))
-		     ((not (null? items)) (lose))))
-	     (if (eq? item (car items))
-		 (cdr head)
-		 head)))
-	  ((null? items) items)
+(define (alist-copy alist)
+  (let ((lose (lambda () (error:not-alist alist 'ALIST-COPY))))
+    (cond ((pair? alist)
+	   (if (pair? (car alist))
+	       (let ((head (cons (car alist) '())))
+		 (let loop ((alist (cdr alist)) (previous head))
+		   (cond ((pair? alist)
+			  (if (pair? (car alist))
+			      (let ((new
+				     (cons (cons (caar alist) (cdar alist))
+					   '())))
+				(set-cdr! previous new)
+				(loop (cdr alist) new))
+			      (lose)))
+			 ((not (null? alist)) (lose))))
+		 head)
+	       (lose)))
+	  ((null? alist) alist)
 	  (else (lose)))))
-
-(define (delq! item items)
-  (letrec ((trim-initial-segment
-	    (lambda (items*)
-	      (if (pair? items*)
-		  (if (eq? item (car items*))
-		      (trim-initial-segment (cdr items*))
-		      (begin
-			(locate-initial-segment items* (cdr items*))
-			items*))
-		  (begin
-		    (if (not (null? items*))
-			(error:not-list items 'DELQ!))
-		    '()))))
-	   (locate-initial-segment
-	    (lambda (last this)
-	      (if (pair? this)
-		  (if (eq? item (car this))
-		      (set-cdr! last (trim-initial-segment (cdr this)))
-		      (locate-initial-segment this (cdr this)))
-		  (if (not (null? this))
-		      (error:not-list items 'DELQ!))))))
-    (trim-initial-segment items)))
 
 ;;;; Lastness and Segments
 
@@ -995,4 +1036,41 @@ USA.
       (error:not-pair object procedure)))
 
 (define (error:not-pair object procedure)
-  (error:wrong-type-argument object "pair" procedure))
\ No newline at end of file
+  (error:wrong-type-argument object "pair" procedure))
+
+(define (member-procedure predicate)
+  (lambda (item items)
+    (let loop ((items* items))
+      (if (pair? items*)
+	  (if (predicate (car items*) item)
+	      items*
+	      (loop (cdr items*)))
+	  (begin
+	    (if (not (null? items*))
+		(error:not-list items #f))
+	    #f)))))
+
+(define (add-member-procedure predicate)
+  (let ((member (member-procedure predicate)))
+    (lambda (item items)
+      (if (member item items)
+	  items
+	  (cons item items)))))
+
+(define ((delete-member-procedure deletor predicate) item items)
+  ((deletor (lambda (match) (predicate match item))) items))
+
+(define (association-procedure predicate selector)
+  (lambda (key items)
+    (let loop ((items* items))
+      (if (pair? items*)
+	  (if (predicate (selector (car items*)) key)
+	      (car items*)
+	      (loop (cdr items*)))
+	  (begin
+	    (if (not (null? items*))
+		(error:not-list items #f))
+	    #f)))))
+
+(define ((delete-association-procedure deletor predicate selector) key alist)
+  ((deletor (lambda (entry) (predicate (selector entry) key))) alist))
\ No newline at end of file
diff --git a/v7/src/runtime/make.scm b/v7/src/runtime/make.scm
index 19074f5b2..13ac03dcc 100644
--- a/v7/src/runtime/make.scm
+++ b/v7/src/runtime/make.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: make.scm,v 14.95 2004/10/28 19:38:09 cph Exp $
+$Id: make.scm,v 14.96 2004/11/17 05:24:19 cph Exp $
 
 Copyright 1988,1989,1990,1991,1992,1993 Massachusetts Institute of Technology
 Copyright 1994,1995,1996,1997,1998,2000 Massachusetts Institute of Technology
@@ -385,7 +385,6 @@ USA.
   (lexical-assignment (package-reference '(RUNTIME GARBAGE-COLLECTOR))
 		      'CONSTANT-SPACE/BASE
 		      constant-space/base)
-  (package-initialize '(RUNTIME LIST) 'INITIALIZE-PACKAGE! #t)
   (package-initialize '(RUNTIME RANDOM-NUMBER) 'INITIALIZE-PACKAGE! #t)
   (package-initialize '(RUNTIME GENERIC-PROCEDURE) 'INITIALIZE-TAG-CONSTANTS!
 		      #t)
diff --git a/v7/src/runtime/runtime.pkg b/v7/src/runtime/runtime.pkg
index 11c3c55c0..128d5c4c7 100644
--- a/v7/src/runtime/runtime.pkg
+++ b/v7/src/runtime/runtime.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: runtime.pkg,v 14.509 2004/11/17 04:42:42 cph Exp $
+$Id: runtime.pkg,v 14.510 2004/11/17 05:24:31 cph Exp $
 
 Copyright 1988,1989,1990,1991,1992,1993 Massachusetts Institute of Technology
 Copyright 1994,1995,1996,1997,1998,1999 Massachusetts Institute of Technology
@@ -2186,8 +2186,7 @@ USA.
 	  weak-pair/car?
 	  weak-pair?
 	  weak-set-car!
-	  weak-set-cdr!)
-  (initialization (initialize-package!)))
+	  weak-set-cdr!))
 
 (define-package (runtime load)
   (files "load")