Save specifiers for nicer printing (#30)

classes.lisp

@@ -1,6 +1,7 @@
 (in-package #:ctype)
 
-(defclass ctype () ())
+(defclass ctype ()
+  ((%specifier :accessor %specifier :initform nil)))
 (defmethod make-load-form ((obj ctype) &optional env)
   (make-load-form-saving-slots obj :environment env))
 

generic-functions.lisp

@@ -81,13 +81,18 @@
 
 (defgeneric unparse (ctype))
 
+(defun specifier (ctype)
+  ;; If we've saved the original specifier use that.
+  ;; Otherwise try to compute a reasonable unparse.
+  (or (%specifier ctype) (unparse ctype)))
+
 (defmethod print-object ((ct ctype) stream)
-  (multiple-value-bind (unparse failure)
-      (ignore-errors (unparse ct))
+  (multiple-value-bind (specifier failure)
+      (ignore-errors (specifier ct))
     (if failure
         (call-next-method)
         (print-unreadable-object (ct stream :type t)
-          (write unparse :stream stream))))
+          (write specifier :stream stream))))
   ct)
 
 (macrolet

parse.lisp

@@ -555,10 +555,12 @@
   (let ((ct (parse client specifier env)))
     (when (typep ct 'cvalues)
       (error "Found ~s in non-~s context" (unparse ct) 'values))
+    (setf (%specifier ct) specifier)
     ct))
 
 (defun values-specifier-ctype (client specifier &optional env)
   (let ((ct (parse client specifier env)))
+    (setf (%specifier ct) specifier)
     (if (typep ct 'cvalues)
         ct
         ;; Treat X as (values X).