X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=tokens.inc;h=6c6c856e756fa91d3df9eb0542050bdeab1cc30c;hb=227b0eb126a28cde3726b5618a6767dba1393bf5;hp=eab05be744fa71f2730e08d0ab67c7b7c4edc686;hpb=32d427603859262f2e0fd49651b91fb925c779a4;p=cparser

diff --git a/tokens.inc b/tokens.inc
index eab05be..6c6c856 100644
--- a/tokens.inc
+++ b/tokens.inc
@@ -1,7 +1,3 @@
-#ifndef TS
-#define TS(x,str,val)
-#endif
-
 /* These must go first. Some set explicit values. */
 #define ALTERNATE(name, val)          T(_CXX, T_##name, #name,  val)
 #define PUNCTUATOR(name, string, val) T(_ALL, T_##name, string, val)
@@ -9,13 +5,12 @@
 #undef PUNCTUATOR
 #undef ALTERNATE
 
-#define S(name, description) TS(T_##name, description,)
+#define S(name, description) T(_ALL, T_##name, description,)
 S(EOF,                "end of input")
 S(IDENTIFIER,         "identifier")
 S(NUMBER,             "number constant")
 S(CHARACTER_CONSTANT, "character constant")
 S(STRING_LITERAL,     "string literal")
-S(HEADERNAME,         "headername")
 S(MACRO_PARAMETER,    "macro parameter")
 S(UNKNOWN_CHAR,       "unknown character")
 #undef S
@@ -83,7 +78,13 @@ S(_CXX, virtual)
 S(_CXX, wchar_t)
 
 S(_C99|_GNUC, _Bool)
-S(_ALL, __thread)
+
+S(_C11, _Alignas)
+S(_C11, _Atomic)
+S(_C11, _Generic)
+S(_C11, _Noreturn)
+S(_C11, _Static_assert)
+
 S(_ALL, __extension__)
 S(_ALL, __builtin_classify_type)
 S(_ALL, __builtin_va_list)
@@ -107,6 +108,8 @@ S(_MS, __FUNCDNAME__)
 #define S(mode, x, val) T(mode, T_##x, #x, val)
 S(_C99,            __func__,)
 S(_ALL,            __FUNCTION__,           = T___func__)
+S(_C11,             _Thread_local,         )
+S(_ALL,            __thread,               = T__Thread_local)
 S(_ALL,              signed,               )
 S(_ALL,            __signed,               = T_signed)
 S(_ALL,            __signed__,             = T_signed)
@@ -118,9 +121,10 @@ S(_ALL,            __real__,               )
 S(_ALL,            __real,                 = T___real__)
 S(_ALL,            __imag__,               )
 S(_ALL,            __imag,                 = T___imag__)
-S(_ALL,            __alignof__,            )
-S(_ALL,            __alignof,              = T___alignof__)
-S(_MS,              _alignof,              = T___alignof__)
+S(_C11,             _Alignof,              )
+S(_ALL,            __alignof__,            = T__Alignof)
+S(_ALL,            __alignof,              = T__Alignof)
+S(_MS,              _alignof,              = T__Alignof)
 S(_ALL,              const,                )
 S(_ALL,            __const,                = T_const)
 S(_ALL,            __const__,              = T_const)