X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/93be387859a5e20262d4c7aa57cd2d1fa2be8c29..0e7cdea08f8c635a46e66bd0a96bb6f12b907bbc:/src/c-types-parse.lisp

diff --git a/src/c-types-parse.lisp b/src/c-types-parse.lisp
index 42a23d3..018c108 100644
--- a/src/c-types-parse.lisp
+++ b/src/c-types-parse.lisp
@@ -89,7 +89,10 @@
 
 (defparameter *declspec-map*
   (let ((map (make-hash-table :test #'equal)))
-    (dolist (item '((type :void :char :int :float :double)
+    (dolist (item '((type :void :char :int :float :double
+			  (:bool :name "_Bool"))
+		    (complexity (:complex :name "_Complex")
+				(:imaginary :name "_Imaginary"))
 		    ((type :taggedp t) :enum :struct :union)
 		    (size :short :long (:long-long :name "long long"))
 		    (sign :signed :unsigned)
@@ -110,6 +113,8 @@
 				     :taggedp taggedp)))
 	      (setf (gethash name map) ds
 		    (gethash label map) ds))))))
+    (dolist (label '(:complex :imaginary :bool))
+      (setf (gethash (string-downcase label) map) (gethash label map)))
     map)
   "Maps symbolic labels and textual names to `declspec' instances.")
 
@@ -119,6 +124,7 @@
   ;; This could have been done with `defstruct' just as well, but a
   ;; `defclass' can be tweaked interactively, which is a win at the moment.
   ((type :initform nil :initarg :type :reader ds-type)
+   (complexity :initform nil :initarg :complexity :reader ds-complexity)
    (sign :initform nil :initarg :sign :reader ds-sign)
    (size :initform nil :initarg :size :reader ds-size)
    (qualifier :initform nil :initarg :qualifiers :reader ds-qualifiers))
@@ -142,19 +148,22 @@
 (defmethod ds-kind ((ty c-type)) 'type)
 
 (defparameter *good-declspecs*
-  '(((:int) (:signed :unsigned) (:short :long :long-long))
-    ((:char) (:signed :unsigned) ())
-    ((:double) () (:long))
-    (t () ()))
+  '(((:int) (:signed :unsigned) (:short :long :long-long) ())
+    ((:char) (:signed :unsigned) () ())
+    ((:double) () (:long) (:complex :imaginary))
+    (t () () ()))
   "List of good collections of declaration specifiers.
 
-   Each item is a list of the form (TYPES SIGNS SIZES).  Each of TYPES, SIGNS
-   and SIZES is either a list of acceptable specifiers of the appropriate
-   kind, or T, which matches any specifier.")
+   Each item is a list of the form (TYPES SIGNS SIZES COMPLEXITIES).  Each of
+   TYPES, SIGNS, SIZES, and COMPLEXITIES, is either a list of acceptable
+   specifiers of the appropriate kind, or T, which matches any specifier.")
 
 (defun good-declspecs-p (specs)
   "Are SPECS a good collection of declaration specifiers?"
-  (let ((speclist (list (ds-type specs) (ds-sign specs) (ds-size specs))))
+  (let ((speclist (list (ds-type specs)
+			(ds-sign specs)
+			(ds-size specs)
+			(ds-complexity specs))))
     (some (lambda (it)
 	    (every (lambda (spec pat)
 		     (or (eq pat t) (null spec)