From: Chris Hanson <org/chris-hanson/cph>
Date: Sat, 13 Jan 2018 19:13:38 +0000 (-0800)
Subject: Eliminate tagged-object-{tag,datum} since they're identical to the % ones.
X-Git-Tag: mit-scheme-pucked-x11-0.3.1~7^2~371
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=d59cbc866eb6084f845b297adfc61a88bed8a372;p=mit-scheme.git

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 815882bc1..fd8cce3c3 100644
--- a/src/runtime/predicate-tagging.scm
+++ b/src/runtime/predicate-tagging.scm
@@ -29,14 +29,6 @@ USA.
 
 (declare (usual-integrations))
 
-(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 d1dd8052a..dcfc4bc73 100644
--- 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 a1aec9ef3..3e429782b 100644
--- 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