From 01f11228cdb55e707e0a81877592d8601df36a01 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Wed, 13 Jul 1988 18:42:10 +0000
Subject: [PATCH] Change `parser-table/set-entry!' to default its
 "collect-list" argument by wrapping its "parse-object" argument with
 `collect-list-wrapper'.

---
 v7/src/runtime/parse.scm   | 10 ++--------
 v7/src/runtime/partab.scm  | 19 ++++++++++++-------
 v7/src/runtime/runtime.pkg |  4 +++-
 v7/src/runtime/version.scm |  4 ++--
 v8/src/runtime/runtime.pkg |  4 +++-
 5 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/v7/src/runtime/parse.scm b/v7/src/runtime/parse.scm
index 1b73167b9..27e1e9773 100644
--- a/v7/src/runtime/parse.scm
+++ b/v7/src/runtime/parse.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/parse.scm,v 14.1 1988/06/13 11:49:02 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/parse.scm,v 14.2 1988/07/13 18:41:16 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -94,13 +94,7 @@ MIT in each case. |#
 			    parse-object/special-undefined
 			    collect-list/special-undefined)))
     (for-each (lambda (entry)
-		(parser-table/set-entry!
-		 table
-		 (car entry)
-		 (cadr entry)
-		 (if (null? (cddr entry))
-		     (collect-list-wrapper (cadr entry))
-		     (caddr entry))))
+		(apply parser-table/set-entry! table entry))
 	      `(("#" ,parse-object/special ,collect-list/special)
 		(,char-set/symbol-leaders ,parse-object/symbol)
 		(("#b" "#B") ,parse-object/numeric-prefix)
diff --git a/v7/src/runtime/partab.scm b/v7/src/runtime/partab.scm
index a37fab566..49434fe78 100644
--- a/v7/src/runtime/partab.scm
+++ b/v7/src/runtime/partab.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/partab.scm,v 14.2 1988/06/13 11:49:18 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/partab.scm,v 14.3 1988/07/13 18:41:33 cph Rel $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -84,13 +84,18 @@ MIT in each case. |#
       (receiver (vector-ref parse-object-table index)
 		(vector-ref collect-list-table index)))))
 
-(define (parser-table/set-entry! table char parse-object collect-list)
+(define (parser-table/set-entry! table char
+				 parse-object #!optional collect-list)
   (let ((kernel
-	 (lambda (char)
-	   (decode-parser-char table char
-	     (lambda (index parse-object-table collect-list-table)
-	       (vector-set! parse-object-table index parse-object)
-	       (vector-set! collect-list-table index collect-list))))))
+	 (let ((collect-list
+		(if (default-object? collect-list)
+		    (collect-list-wrapper parse-object)
+		    collect-list)))
+	   (lambda (char)
+	     (decode-parser-char table char
+	       (lambda (index parse-object-table collect-list-table)
+		 (vector-set! parse-object-table index parse-object)
+		 (vector-set! collect-list-table index collect-list)))))))
     (cond ((char-set? char) (for-each kernel (char-set-members char)))
 	  ((pair? char) (for-each kernel char))
 	  (else (kernel char)))))
diff --git a/v7/src/runtime/runtime.pkg b/v7/src/runtime/runtime.pkg
index 2e90ab3b0..958e11ad2 100644
--- a/v7/src/runtime/runtime.pkg
+++ b/v7/src/runtime/runtime.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/runtime.pkg,v 14.10 1988/07/07 16:12:23 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/runtime.pkg,v 14.11 1988/07/13 18:41:50 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -1001,6 +1001,8 @@ MIT in each case. |#
 	  lambda-optional-tag)
   (export (runtime unsyntaxer)
 	  lambda-optional-tag)
+  (export (runtime parser-table)
+	  collect-list-wrapper)
   (initialization (initialize-package!)))
 
 (define-package (runtime parser-table)
diff --git a/v7/src/runtime/version.scm b/v7/src/runtime/version.scm
index 04f7431e4..188e02ae8 100644
--- a/v7/src/runtime/version.scm
+++ b/v7/src/runtime/version.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/version.scm,v 14.9 1988/07/07 16:13:39 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/version.scm,v 14.10 1988/07/13 18:42:10 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -45,7 +45,7 @@ MIT in each case. |#
 		     '()))
   (add-system! microcode-system)
   (add-event-receiver! event:after-restore snarf-microcode-version!)
-  (add-identification! "Runtime" 14 9))
+  (add-identification! "Runtime" 14 10))
 
 (define microcode-system)
 
diff --git a/v8/src/runtime/runtime.pkg b/v8/src/runtime/runtime.pkg
index b8db1af71..1d6990d1e 100644
--- a/v8/src/runtime/runtime.pkg
+++ b/v8/src/runtime/runtime.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/runtime.pkg,v 14.10 1988/07/07 16:12:23 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/runtime.pkg,v 14.11 1988/07/13 18:41:50 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -1001,6 +1001,8 @@ MIT in each case. |#
 	  lambda-optional-tag)
   (export (runtime unsyntaxer)
 	  lambda-optional-tag)
+  (export (runtime parser-table)
+	  collect-list-wrapper)
   (initialization (initialize-package!)))
 
 (define-package (runtime parser-table)
-- 
2.25.1