From: Nick Bowler <nbowler@draconx.ca>
Date: Thu, 23 Jun 2011 00:30:53 +0000 (-0400)
Subject: Allow (and ignore) underscores in the list of type names.
X-Git-Tag: v1~170
X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/commitdiff_plain/7d9bb0d5a0b1c8217319b012a75f439810ab41f2

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 f81b424..f2f7bf2 100644
--- 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 fd45fde..286e89a 100644
--- 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 &:/