implemented -Wall, -Wextra, -Wunused, -Wunused-function with limited

[cparser] / token.c

diff --git a/token.c b/token.c
index d567124..c2d5345 100644 (file)
--- a/token.c
+++ b/token.c
@@ -6,6 +6,7 @@
 #include <stdio.h>
 
 #include "symbol.h"
+#include "lang_features.h"
 #include "adt/array.h"
 
 static symbol_t *token_symbols[T_LAST_TOKEN];
@@ -15,14 +16,21 @@ source_position_t builtin_source_position = { "<built-in>", 0 };
 void init_tokens(void)
 {
        symbol_t *symbol;
+       int       last_id = -2;
 
        memset(token_symbols, 0, T_LAST_TOKEN * sizeof(token_symbols[0]));
 
-#define T(x,str,val)                                               \
-       assert(T_##x >= 0 && T_##x < T_LAST_TOKEN);                    \
-       symbol               = symbol_table_insert(str);               \
-       symbol->ID           = T_##x;                                  \
-       token_symbols[T_##x] = symbol;
+#define T(mode,x,str,val)                                          \
+       if (T_##x > 255) {                                             \
+               assert(T_##x >= last_id);                                  \
+               last_id = T_##x;                                           \
+       }                                                              \
+       if (c_mode & (mode)) {                                         \
+               assert(T_##x >= 0 && T_##x < T_LAST_TOKEN);                \
+               symbol               = symbol_table_insert(str);           \
+               symbol->ID           = T_##x;                              \
+               token_symbols[T_##x] = symbol;                             \
+       }
 
 #define TS(x,str,val)                                              \
        assert(T_##x >= 0 && T_##x < T_LAST_TOKEN);                    \
@@ -34,7 +42,7 @@ void init_tokens(void)
 #undef TS
 #undef T
 
-#define T(x,str,val)                                               \
+#define T(mode,x,str,val)                                          \
        assert(TP_##x >= 0 && TP_##x < TP_LAST_TOKEN);                 \
        symbol               = symbol_table_insert(str);               \
        symbol->pp_ID        = TP_##x;
@@ -90,7 +98,7 @@ void print_token(FILE *f, const token_t *token)
                fprintf(f, "floatingpointer number %LF", token->v.floatvalue);
                break;
        case T_STRING_LITERAL:
-               fprintf(f, "string '%s'", token->v.string);
+               fprintf(f, "string '%s'", token->v.string.begin); /* TODO suboptimal */
                break;
        default:
                print_token_type(f, (token_type_t)token->type);