From 34c51b1c9911d604386f0dc77336ad52ea81c68e Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 30 Aug 2015 10:58:38 +0100
Subject: [PATCH] src/codegen-proto.lisp, doc/list-exports.lisp: Export `inst'
 readers.

---
 doc/list-exports.lisp  | 9 ++++++---
 src/codegen-proto.lisp | 5 ++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/doc/list-exports.lisp b/doc/list-exports.lisp
index 710da87..fd02f00 100644
--- a/doc/list-exports.lisp
+++ b/doc/list-exports.lisp
@@ -19,10 +19,13 @@
 
 (defmethod form-list-exports ((head (eql 'definst)) tail)
   (destructuring-bind (code (streamvar &key export) args &body body) tail
-    (declare (ignore streamvar args body))
+    (declare (ignore streamvar body))
     (and export
-	 (list (symbolicate code '-inst)
-	       (symbolicate 'make- code '-inst)))))
+	 (list* (symbolicate code '-inst)
+		(symbolicate 'make- code '-inst)
+		(mapcar (lambda (arg)
+			  (symbolicate 'inst- arg))
+			args)))))
 
 (defmethod form-list-exports ((head (eql 'define-tagged-type)) tail)
   (destructuring-bind (kind what) tail
diff --git a/src/codegen-proto.lisp b/src/codegen-proto.lisp
index 571f0b0..7c8f65c 100644
--- a/src/codegen-proto.lisp
+++ b/src/codegen-proto.lisp
@@ -167,7 +167,10 @@
 		 (format stream "~@<~@{~S ~@_~S~^ ~_~}~:>"
 			 ,@(mappend #'list keys args)))
 	       (progn ,@body))))
-       ,@(and export `((export '(,class-name ,constructor-name))))
+       ,@(and export `((export '(,class-name ,constructor-name
+				 ,@(mapcar (lambda (arg)
+					     (symbolicate 'inst- arg))
+					   args)))))
        ',code)))
 
 ;; Important instruction classes.
-- 
2.11.0