Fix problem with printer for instructions introduced by annotation mechanism.

Author: dvanhorn

langs/a86/ast.rkt

@@ -169,14 +169,36 @@
                                               (struct->vector i2))))
                  (define hash-proc  (λ (i hash) (hash (struct->vector i))))
                  (define hash2-proc (λ (i hash) (hash (struct->vector i))))]
+                
+                #:property prop:custom-print-quotable 'never
                 #:methods gen:custom-write
                 [(define write-proc
-                   (make-constructor-style-printer
+		   (instr-print 'Name)
+                   #;(make-constructor-style-printer
                     (lambda (obj) 'Name)        
                     (lambda (obj)
                       (rest (rest (vector->list (struct->vector obj)))))))])
               (define Name? %Name?)))]))
 
+(define (instr-print type)
+  (lambda (instr port mode)
+    (if (number? mode)
+        (write-string "(" port)
+        (write-string "#(struct:" port))
+    (write-string (symbol->string type) port)
+    (let ([recur (case mode
+                   [(#t) write]
+                   [(#f) display]
+                   [else (lambda (p port) (print p port mode))])])
+        (for-each (lambda (e)
+                    (write-string " " port)
+                    (recur e port))
+                  (rest (rest (vector->list (struct->vector instr))))))
+    (if (number? mode)
+        (write-string ")" port)
+        (write-string ")" port))))
+
+
 (instruct Text   ()        check:none)
 (instruct Data   ()        check:none)