doc/syntax.tex: Fix up the syntax notation.

[sod] / src / c-types-impl.lisp

diff --git a/src/c-types-impl.lisp b/src/c-types-impl.lisp
index ed65110..59225b2 100644 (file)
--- a/src/c-types-impl.lisp
+++ b/src/c-types-impl.lisp
@@ -7,7 +7,7 @@
 
 ;;;----- Licensing notice ---------------------------------------------------
 ;;;
-;;; This file is part of the Sensble Object Design, an object system for C.
+;;; This file is part of the Sensible Object Design, an object system for C.
 ;;;
 ;;; SOD is free software; you can redistribute it and/or modify
 ;;; it under the terms of the GNU General Public License as published by
@@ -141,7 +141,11 @@
 
 ;; Built-in C types.
 
-(export '(void float double long-double va-list size-t ptrdiff-t
+(export '(void
+         float double long-double
+         float-complex double-complex long-double-complex
+         float-imaginary double-imaginary long-double-imaginary
+         va-list size-t ptrdiff-t wchar-t
          char unsigned-char uchar signed-char schar
          int signed signed-int sint unsigned unsigned-int uint
          short signed-short short-int signed-short-int sshort
@@ -156,6 +160,7 @@
 (define-simple-c-type char "char")
 (define-simple-c-type (unsigned-char uchar) "unsigned char")
 (define-simple-c-type (signed-char schar) "signed char")
+(define-simple-c-type wchar-t "wchar-t")
 
 (define-simple-c-type (int signed signed-int sint) "int")
 (define-simple-c-type (unsigned unsigned-int uint) "unsigned")
@@ -180,6 +185,16 @@
 (define-simple-c-type double "double")
 (define-simple-c-type long-double "long double")
 
+(define-simple-c-type bool "_Bool")
+
+(define-simple-c-type float-complex "float _Complex")
+(define-simple-c-type double-complex "double _Complex")
+(define-simple-c-type long-double-complex "long double _Complex")
+
+(define-simple-c-type float-imaginary "float _Imaginary")
+(define-simple-c-type double-imaginary "double _Imaginary")
+(define-simple-c-type long-double-imaginary "long double _Imaginary")
+
 (define-simple-c-type va-list "va_list")
 (define-simple-c-type size-t "size_t")
 (define-simple-c-type ptrdiff-t "ptrdiff_t")
@@ -486,8 +501,7 @@
                  ~:>"
          (c-type-subtype type)
          (mapcar (lambda (arg)
-                   (if (eq arg :ellipsis)
-                       arg
+                   (if (eq arg :ellipsis) arg
                        (list (argument-name arg) (argument-type arg))))
                  (c-function-arguments type))))
 
@@ -537,8 +551,7 @@
    That is, with each argument name passed through
    `commentify-argument-name'."
   (mapcar (lambda (arg)
-           (if (eq arg :ellipsis)
-               arg
+           (if (eq arg :ellipsis) arg
                (make-argument (commentify-argument-name (argument-name arg))
                               (argument-type arg))))
          arguments))