improve parsing of function pointers

[cparser] / tokens.inc

diff --git a/tokens.inc b/tokens.inc
index f4f777a..a5f0348 100644 (file)
--- a/tokens.inc
+++ b/tokens.inc
@@ -11,7 +11,6 @@ S(auto)
 S(break)
 S(case)
 S(char)
-S(const)
 S(continue)
 S(default)
 S(do)
@@ -27,7 +26,6 @@ S(inline)
 S(int)
 S(long)
 S(register)
-S(restrict)
 S(return)
 S(short)
 S(signed)
@@ -44,8 +42,16 @@ S(while)
 S(_Bool)
 S(_Complex)
 S(_Imaginary)
+S(__extension__)
+S(__attribute__)
+S(__builtin_va_list)
 #undef S
 
+T(const,               "__const",)
+T(_const,                "const", = T_const)
+T(restrict,         "__restrict",)
+T(_restrict,          "restrict", = T_restrict)
+
 T(SELECT,                   "->",)
 T(PLUSPLUS,                 "++",)
 T(MINUSMINUS,               "--",)
@@ -72,6 +78,13 @@ T(HASHHASH,                 "##",)
 
 #define T_LAST_TOKEN  (T_HASHHASH+1)
 
+T(LESSCOLON,                "<:",   = '[')
+T(COLONGREATER,             ":>",   = ']')
+T(LESSPERCENT,              "<%",   = '{')
+T(PERCENTGREATER,           "%>",   = '}')
+T(PERCENTCOLON,             "%:",   = '#')
+T(PERCENTCOLONPERCENTCOLON, "%:%:", = T_HASHHASH)
+
 T(RBRACK,          "[", = '[')
 T(LBRACK,          "]", = ']')
 T(LBRACE,          "(", = '(')
@@ -98,9 +111,4 @@ T(EQUAL,           "=", = '=')
 T(COMMA,           ",", = ',')
 T(HASH,            "#", = '#')
 
-T(LESSCOLON,                "<:",   = '[')
-T(COLONGREATER,             ":>",   = ']')
-T(LESSPERCENT,              "<%",   = '{')
-T(PERCENTGREATER,           "%>",   = '}')
-T(PERCENTCOLON,             "%:",   = '#')
-T(PERCENTCOLONPERCENTCOLON, "%:%:", = T_HASHHASH)
+TS(NEWLINE,        "newline", = '\n')