From: Mark Wooding Date: Thu, 26 May 2016 08:26:09 +0000 (+0100) Subject: src/c-types-parse.lisp (scan-simple-declspec): Prefer primitive types. X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/sod/commitdiff_plain/655037a5bd793e815bb68e3c103fc7e1bb1c79aa src/c-types-parse.lisp (scan-simple-declspec): Prefer primitive types. Look types up in `*declspec-map*' before consulting the `*module-type-map*'. --- diff --git a/src/c-types-parse.lisp b/src/c-types-parse.lisp index 6f5db4d..13f9145 100644 --- a/src/c-types-parse.lisp +++ b/src/c-types-parse.lisp @@ -258,9 +258,9 @@ (defun scan-simple-declspec ;; Turns out to be easier to do this by hand. (let ((ds (and (eq (token-type scanner) :id) (let ((kw (token-value scanner))) - (or (and (boundp '*module-type-map*) - (gethash kw *module-type-map*)) - (gethash kw *declspec-map*)))))) + (or (gethash kw *declspec-map*) + (and (boundp '*module-type-map*) + (gethash kw *module-type-map*))))))) (cond ((or (not ds) (and predicate (not (funcall predicate ds)))) (values (list indicator) nil nil)) ((and (typep ds 'declspec) (ds-taggedp ds))