chiark / gitweb /
Return a more robust warning when we try to define a type with a
[clg] / gffi / defpackage.lisp
index 619a897f3081d0af1a97ee1381f3f0c494672a00..1560ea157eb8e4392c6055f16b3f6fb08df6c9d3 100644 (file)
@@ -20,7 +20,7 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: defpackage.lisp,v 1.14 2008-11-04 20:15:35 espen Exp $
+;; $Id: defpackage.lisp,v 1.16 2008-12-10 02:39:17 espen Exp $
 
 (defpackage "GFFI"
   (:use "COMMON-LISP" "AUTOEXPORT" "PKG-CONFIG" "CLG-UTILS")
@@ -46,7 +46,9 @@ (defpackage "GFFI"
   #+sbcl(:import-from "SB-ALIEN" "VOID" "C-STRING")
   ;; Symbols from memory.lisp
   (:export "MAKE-POINTER" "POINTER-ADDRESS" "NULL-POINTER-P" "POINTER=" 
-          "POINTER+" "REF-POINTER" "REF-BYTE" "REF-INT-32" "REF-UINT-32"
+          "POINTER+" "REF-POINTER" 
+          "REF-INT-8" "REF-INT-16" "REF-INT-32" "REF-INT-64"
+          "REF-UINT-8" "REF-UINT-16" "REF-UINT-32" "REF-UINT-64"
           "REF-DOUBLE-FLOAT" "REF-SINGLE-FLOAT" "ALLOCATE-MEMORY"
           "DEALLOCATE-MEMORY" "COPY-MEMORY" "CLEAR-MEMORY" "MEMORY-CLEAR-P"
           "WITH-MEMORY" "WITH-POINTER" "*MEMORY-ALLOCATOR*" 
@@ -56,7 +58,7 @@ (defpackage "GFFI"
           "DEFINE-CALLBACK" "CALLBACK" "CALLBACK-ADDRESS"
           "DEFINE-TYPE-GENERIC" "DEFINE-TYPE-METHOD" "IN-ARG-P" "OUT-ARG-P"
           "DEFAULT-ALIEN-TYPE-NAME" "DEFAULT-TYPE-NAME" "TYPE-EXPAND" 
-          "TYPE-EXPAND-1" "TYPE-EXPAND-TO")
+          "TYPE-EXPAND-1" "TYPE-EXPAND-TO" "TYPE-EQUAL-P")
   ;; Symbols from basic-types.lisp
   (:export "LONG" "UNSIGNED-LONG" "INT" "UNSIGNED-INT" "SHORT" "UNSIGNED-SHORT"
           "SIGNED" "UNSIGNED" "CHAR" "POINTER" "BOOL" "COPY-OF" "STATIC" 
@@ -71,9 +73,9 @@ (defpackage "GFFI"
   ;; Symbols from vector.lisp
   (:export "MAKE-C-VECTOR" "MAP-C-VECTOR" "WITH-C-VECTOR" "COUNTED-VECTOR"
           "NULL-TERMINATED-VECTOR" "VECTOR-READER-FUNCTION"
-          "VECTOR-WRITER-FUNCTION" "VECTOR-REF-BYTE" "VECTOR-REF-INT-16"
-          "VECTOR-REF-UINT-16" "VECTOR-REF-INT-32" "VECTOR-REF-UINT-32"
-          "VECTOR-REF-INT-64" "VECTOR-REF-UINT-64" "VECTOR-REF-DOUBLE-FLOAT" 
+          "VECTOR-WRITER-FUNCTION" "VECTOR-REF-INT-8" "VECTOR-REF-INT-16"
+          "VECTOR-REF-UINT-8" "VECTOR-REF-UINT-16" "VECTOR-REF-UINT-32" 
+          "VECTOR-REF-UINT-64" "VECTOR-REF-DOUBLE-FLOAT" 
           "VECTOR-REF-SINGLE-FLOAT" "UNBOXED-VECTOR")
   ;; Symbols from enums.lisp
   (:export "ENUM" "ENUM-INT" "INT-ENUM" "ENUM-MAPPING" "DEFINE-ENUM-TYPE"