From 93348ae9e276dec213b5d543338b1e2c53a7b687 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/: Fix up some wrong exports.

Various small bugs:

  * Some symbols which should have been exported weren't.

  * One export was mispslet.

  * One export was duplicated.

  * One was a failed attempt to export an instruction, but `definst' can
    do that properly now.
---
 src/c-types-impl.lisp       | 2 +-
 src/c-types-proto.lisp      | 2 +-
 src/class-layout-proto.lisp | 2 +-
 src/codegen-impl.lisp       | 1 -
 src/method-proto.lisp       | 3 +--
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/c-types-impl.lisp b/src/c-types-impl.lisp
index b4f02e1..4a0f6e2 100644
--- a/src/c-types-impl.lisp
+++ b/src/c-types-impl.lisp
@@ -485,7 +485,7 @@
 			(list (argument-name arg) (argument-type arg))))
 		  (c-function-arguments type))))
 
-(export '(fun function func fn))
+(export '(fun function () func fn))
 (define-c-type-syntax fun (ret &rest args)
   "Return the type of functions which returns RET and has arguments ARGS.
 
diff --git a/src/c-types-proto.lisp b/src/c-types-proto.lisp
index 9481a99..a2c57cd 100644
--- a/src/c-types-proto.lisp
+++ b/src/c-types-proto.lisp
@@ -149,7 +149,7 @@
 
    This function is suitable for use in `format's ~/.../ command."))
 
-(export 'expand-c-type-spec)
+(export '(expand-c-type-spec expand-c-type-form))
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defgeneric expand-c-type-spec (spec)
     (:documentation
diff --git a/src/class-layout-proto.lisp b/src/class-layout-proto.lisp
index 19bb897..a4ca263 100644
--- a/src/class-layout-proto.lisp
+++ b/src/class-layout-proto.lisp
@@ -169,7 +169,7 @@
    CHAIN-HEAD.  The CHAIN-TAIL is the most specific superclass of SUBCLASS on
    this chain.  The ENTRIES are a list of `method-entry' objects."))
 
-(export 'compte-vtmsgs)
+(export 'compute-vtmsgs)
 (defgeneric compute-vtmsgs (class subclass chain-head chain-tail)
   (:documentation
    "Return a `vtmsgs' object containing method entries for CLASS.
diff --git a/src/codegen-impl.lisp b/src/codegen-impl.lisp
index acb0da1..3104bcb 100644
--- a/src/codegen-impl.lisp
+++ b/src/codegen-impl.lisp
@@ -40,7 +40,6 @@
 (defmethod commentify-argument-name ((name temporary-name))
   nil)
 
-(export 'temporary-function)
 (defun temporary-function ()
   "Return a temporary function name."
   (make-instance 'temporary-function
diff --git a/src/method-proto.lisp b/src/method-proto.lisp
index 7fd08b8..e87745f 100644
--- a/src/method-proto.lisp
+++ b/src/method-proto.lisp
@@ -257,8 +257,7 @@
 
 ;;; Additional instructions.
 
-(export 'convert-to-ilayout)
-(definst convert-to-ilayout (stream) (class chain-head expr)
+(definst convert-to-ilayout (stream :export t) (class chain-head expr)
   (format stream "SOD_ILAYOUT(~@<~A, ~_~A, ~_~A~:>)"
 	  class (sod-class-nickname chain-head) expr))
 
-- 
2.11.0