Allow (and ignore) underscores in the list of type names.

This allows the "true" keywords to be used in the list.

diff --git a/src/validtypes.in b/src/validtypes.in
index f81b4240d37d7fda7939ed4e7f09135aa43c67d1..f2f7bf29a9a0ff81390e8a31c17a438eb7190dac 100644 (file)
--- a/src/validtypes.in
+++ b/src/validtypes.in
@@ -26,13 +26,13 @@ signed long long
 signed long long int
 unsigned long long
 unsigned long long int
-bool
+_Bool
 float
 double
 long double
-float complex
-double complex
-long double complex
+float _Complex
+double _Complex
+long double _Complex
 struct
 union
 enum

diff --git a/src/validtypes.sed b/src/validtypes.sed
index fd45fde7871f4f1bd57a58c7a3d00e7c635d01d1..286e89aebc1c1c609bebcbe150b4716129089797 100644 (file)
--- a/src/validtypes.sed
+++ b/src/validtypes.sed
@@ -1,8 +1,10 @@
 1i\
 /* This file is automatically generated by validtypes.sed */
-/[^[:alpha:][:space:]]/b
+/[^_[:alpha:][:space:]]/b
+s/[[:space:]][[:space:]]*/ /g
+s/_//g
 y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/
-s/LONG[[:space:]][[:space:]]*LONG/LLONG LONG/
+s/LONG LONG/LLONG LONG/
 s/[[:upper:]][[:upper:]]*/(1ul<<CDECL_TYPE_&)/g
-s/[[:space:]][[:space:]]*/|/g
+s/ /|/g
 s/.*/case &:/