improvements in statement parsing, improvements in ast printing

[cparser] / tokens.inc

diff --git a/tokens.inc b/tokens.inc
index 996666b..ff8b237 100644 (file)
--- a/tokens.inc
+++ b/tokens.inc
@@ -3,7 +3,6 @@
 #endif
 
 TS(IDENTIFIER,     "identifier", = 256)
-TS(TYPENAME,       "typename",)
 TS(INTEGER,        "integer number",)
 TS(STRING_LITERAL, "string literal",)
 
@@ -12,7 +11,6 @@ S(auto)
 S(break)
 S(case)
 S(char)
-S(const)
 S(continue)
 S(default)
 S(do)
@@ -24,11 +22,9 @@ S(float)
 S(for)
 S(goto)
 S(if)
-S(inline)
 S(int)
 S(long)
 S(register)
-S(restrict)
 S(return)
 S(short)
 S(signed)
@@ -47,10 +43,18 @@ S(_Complex)
 S(_Imaginary)
 S(__extension__)
 S(__attribute__)
-S(__u_quad_t)
-S(__quad_t)
+S(__builtin_va_list)
 #undef S
 
+T(const,               "__const",)
+T(_const,                "const", = T_const)
+T(restrict,         "__restrict",)
+T(_restrict,          "restrict", = T_restrict)
+T(asm,                     "asm",)
+T(__asm__,             "__asm__", = T_asm)
+T(inline,               "inline",)
+T(__inline,           "__inline", = T_inline)
+
 T(SELECT,                   "->",)
 T(PLUSPLUS,                 "++",)
 T(MINUSMINUS,               "--",)