From ea6d68294c662ad41f512c47848c413a6d29561d Mon Sep 17 00:00:00 2001
From: Taylor R Campbell <campbell@mumble.net>
Date: Fri, 26 Oct 2018 16:17:41 +0000
Subject: [PATCH] Fix unparser->print method fallout.

---
 src/compiler/base/object.scm | 54 +++++++++++++-----------------------
 1 file changed, 20 insertions(+), 34 deletions(-)

diff --git a/src/compiler/base/object.scm b/src/compiler/base/object.scm
index 43b4dabc5..34f84b607 100644
--- a/src/compiler/base/object.scm
+++ b/src/compiler/base/object.scm
@@ -33,7 +33,6 @@ USA.
   (parent false read-only true)
   (name false read-only true)
   (index false read-only true)
-  (%unparser false)
   (description false)
   (method-alist '())
 
@@ -44,41 +43,31 @@ USA.
 
 (define make-vector-tag
   (let ((root-tag (%make-vector-tag false 'OBJECT false false)))
-    (set-vector-tag-%unparser!
-     root-tag
-     (standard-print-method
-      (lambda (object)
-	(string "LIAR:" (vector-tag-name (tagged-vector/tag object))))))
+    (define-print-method (lambda (object)
+			   (and (vector? object)
+				(fix:> (vector-length object) 0)
+				(eq? root-tag (vector-ref object 0))))
+      (standard-print-method
+       (lambda (object)
+	 (string "LIAR:" (vector-tag-name (tagged-vector/tag object))))))
     (named-lambda (make-vector-tag parent name enumeration)
-      (let ((tag
-	     (%make-vector-tag (or parent root-tag)
-			       name
-			       (and enumeration
-				    (enumeration/name->index enumeration
-							     name))
-			       ;; Propagate this downward at construction time
-			       ;; to avoid having to crawl upward at use time.
-			       (and parent (vector-tag-noop parent)))))
-	(define-print-method (lambda (object)
-			       (and (vector? object)
-				    (fix:> (vector-length object) 0)
-				    (eq? tag (vector-ref object 0))))
-	  (lambda (vector port)
-	    (parameterize ((param:printer-radix 16))
-	      ((tagged-vector/unparser vector) vector port))))
-	tag))))
+      (%make-vector-tag (or parent root-tag)
+			name
+			(and enumeration
+			     (enumeration/name->index enumeration
+						      name))
+			;; Propagate this downward at construction time
+			;; to avoid having to crawl upward at use time.
+			(and parent (vector-tag-noop parent))))))
 
 (define (define-vector-tag-unparser tag unparser)
-  (set-vector-tag-%unparser! tag unparser)
+  (define-print-method (lambda (object)
+			 (and (vector? object)
+			      (fix:> (vector-length object) 0)
+			      (eq? tag (vector-ref object 0))))
+    unparser)
   (vector-tag-name tag))
 
-(define (vector-tag-unparser tag)
-  (or (vector-tag-%unparser tag)
-      (let ((parent (vector-tag-parent tag)))
-	(if parent
-	    (vector-tag-unparser parent)
-	    (error "Missing unparser" tag)))))
-
 (define (vector-tag-put! tag key value)
   (let ((entry (assq key (vector-tag-method-alist tag))))
     (if entry
@@ -113,9 +102,6 @@ USA.
 (define-integrable (tagged-vector/index vector)
   (vector-tag-index (tagged-vector/tag vector)))
 
-(define-integrable (tagged-vector/unparser vector)
-  (vector-tag-unparser (tagged-vector/tag vector)))
-
 (define (tagged-vector? object)
   (and (vector? object)
        (not (zero? (vector-length object)))
-- 
2.25.1