Changed *unparse-with-addresses?* to *unparse-with-datum?*

diff --git a/v7/src/runtime/unpars.scm b/v7/src/runtime/unpars.scm
index d8f5a6ffd40d400e7c757c396ca5c0b26b0dc480..c4189bc73d726c859c10ca6dcfbea5c691ec780a 100644 (file)
--- a/v7/src/runtime/unpars.scm
+++ b/v7/src/runtime/unpars.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: unpars.scm,v 14.35 1994/08/04 00:25:28 adams Exp $
+$Id: unpars.scm,v 14.36 1994/08/04 15:23:27 adams Exp $
 
 Copyright (c) 1988-1994 Massachusetts Institute of Technology
 
@@ -53,7 +53,7 @@ MIT in each case. |#
   (set! *unparse-disambiguate-null-as-itself?* true)
   (set! *unparse-disambiguate-null-lambda-list?* false)
   (set! *unparse-compound-procedure-names?* true)
-  (set! *unparse-with-addresses?* false)
+  (set! *unparse-with-datum?* false)
   (set! system-global-unparser-table (make-system-global-unparser-table))
   (set! *default-list-depth* 0)
   (set-current-unparser-table! system-global-unparser-table))
@@ -68,7 +68,7 @@ MIT in each case. |#
 (define *unparse-disambiguate-null-as-itself?*)
 (define *unparse-disambiguate-null-lambda-list?*)
 (define *unparse-compound-procedure-names?*)
-(define *unparse-with-addresses?*)
+(define *unparse-with-datum?*)
 (define system-global-unparser-table)
 (define *default-list-depth*)
 (define *current-unparser-table*)
@@ -245,7 +245,11 @@ MIT in each case. |#
        (if thunk
            (begin
              (*unparse-char #\Space)
-             (thunk)))
+             (thunk))
+           (if *unparse-with-datum?*
+               (begin
+                 (*unparse-char #\Space)
+                 (*unparse-datum object))))
        (*unparse-char #\]))))
 \f
 ;;;; Unparser Methods
@@ -254,10 +258,7 @@ MIT in each case. |#
   (let ((type (user-object-type object)))
     (case ((ucode-primitive primitive-object-gc-type 1) object)
       ((1 2 3 4 -3 -4)         ; cell pair triple quad vector compiled
-       (*unparse-with-brackets type object
-        (and *unparse-with-addresses?*
-             (lambda ()
-               (*unparse-datum object)))))
+       (*unparse-with-brackets type object false))
       ((0)                     ; non pointer
        (*unparse-with-brackets type object
         (lambda ()