Eliminate tagged-object-{tag,datum} since they're identical to the % ones.

diff --git a/src/runtime/predicate-tagging.scm b/src/runtime/predicate-tagging.scm
index 815882bc11df5fffa20a233e51c815c70d5c0133..fd8cce3c3a3bb17f1e24581b62e8bbbda4de4d4d 100644 (file)
--- a/src/runtime/predicate-tagging.scm
+++ b/src/runtime/predicate-tagging.scm
@@ -29,14 +29,6 @@ USA.
 
 (declare (usual-integrations))
 \f
-(define (tagged-object-tag object)
-  (guarantee %tagged-object? object 'tagged-object-tag)
-  (%tagged-object-tag object))
-
-(define (tagged-object-datum object)
-  (guarantee %tagged-object? object 'tagged-object-datum)
-  (%tagged-object-datum object))
-
 (define (object->predicate object)
   (tag->predicate (object->tag object)))
 

diff --git a/src/runtime/runtime.pkg b/src/runtime/runtime.pkg
index d1dd8052a82db59c379b748e151c029c209fd480..dcfc4bc73a27a10e85d12c0a918485dd178400aa 100644 (file)
--- a/src/runtime/runtime.pkg
+++ b/src/runtime/runtime.pkg
@@ -1914,8 +1914,6 @@ USA.
          object->predicate)
   (export (runtime)
          object->tag
-         tagged-object-datum
-         tagged-object-tag
          tagging-strategy:never
          tagging-strategy:optional))
 

diff --git a/src/runtime/unpars.scm b/src/runtime/unpars.scm
index a1aec9ef3ee06bf435adb4b3190fd0856dcdfc65..3e429782bb3eb7e910c1bc2f84e9056cf1bf0672 100644 (file)
--- a/src/runtime/unpars.scm
+++ b/src/runtime/unpars.scm
@@ -890,6 +890,10 @@ USA.
 (define (unparse/tagged-object object context)
   (*unparse-with-brackets 'tagged-object object context
     (lambda (context*)
-      (*unparse-object (tag-name (tagged-object-tag object)) context*)
+      (*unparse-object (let ((tag (%tagged-object-tag object)))
+                        (if (tag? tag)
+                            (tag-name tag)
+                            tag))
+                      context*)
       (*unparse-string " " context*)
-      (*unparse-object (tagged-object-datum object) context*))))
\ No newline at end of file
+      (*unparse-object (%tagged-object-datum object) context*))))
\ No newline at end of file