Simplify get_symbol_from_token(): All keywords have symbols.

[cparser] / token_t.h

diff --git a/token_t.h b/token_t.h
index 0f1697d..831afd7 100644 (file)
--- a/token_t.h
+++ b/token_t.h
@@ -26,8 +26,7 @@
 #include "symbol_table.h"
 #include "type.h"
 
-typedef enum token_type_t {
-       T_ERROR = -1,
+typedef enum token_kind_t {
        T_NULL  =  0,
        T_EOF   = '\x04', // EOT
 #define T(mode,x,str,val) T_##x val,
@@ -36,52 +35,78 @@ typedef enum token_type_t {
 #undef TS
 #undef T
        T_LAST_TOKEN
-} token_type_t;
+} token_kind_t;
 
-typedef enum preprocessor_token_type_t {
+typedef enum preprocessor_token_kind_t {
        TP_NULL  = T_NULL,
        TP_EOF   = T_EOF,
-       TP_ERROR = T_ERROR,
 #define T(mode,x,str,val) TP_##x val,
 #define TS(x,str,val) TP_##x val,
 #include "tokens_preprocessor.inc"
 #undef TS
 #undef T
        TP_LAST_TOKEN
-} preprocessor_token_type_t;
+} preprocessor_token_kind_t;
 
 typedef struct source_position_t source_position_t;
 struct source_position_t {
        const char *input_name;
        unsigned    lineno;
-       unsigned    colno;
+       unsigned    colno            : 31;
+       unsigned    is_system_header : 1;
 };
 
 /* position used for "builtin" declarations/types */
 extern const source_position_t builtin_source_position;
 
-typedef struct {
-       int                type;
-       symbol_t          *symbol;  /**< contains identifier. Contains number suffix for numbers */
-       string_t           literal; /**< string value/literal value */
-       source_position_t  source_position;
-} token_t;
+typedef struct token_base_t     token_base_t;
+typedef struct identifier_t     identifier_t;
+typedef struct string_literal_t string_literal_t;
+typedef struct number_literal_t number_literal_t;
+typedef union  token_t          token_t;
+
+struct token_base_t {
+       unsigned          kind;
+       source_position_t source_position;
+};
+
+struct identifier_t {
+       token_base_t  base;
+       symbol_t     *symbol;
+};
+
+struct string_literal_t {
+       token_base_t  base;
+       string_t      string;
+};
+
+struct number_literal_t {
+       token_base_t  base;
+       string_t      number;
+       string_t      suffix;
+};
+
+union token_t {
+       unsigned          kind;
+       token_base_t      base;
+       identifier_t      identifier;
+       string_literal_t  string;
+       number_literal_t  number;
+};
 
 void init_tokens(void);
 void exit_tokens(void);
-void print_token_type(FILE *out, token_type_t token_type);
+void print_token_kind(FILE *out, token_kind_t token_kind);
 void print_token(FILE *out, const token_t *token);
 
-symbol_t *get_token_symbol(const token_t *token);
-
-void print_pp_token_type(FILE *out, int type);
+void print_pp_token_kind(FILE *out, int kind);
 void print_pp_token(FILE *out, const token_t *token);
 
 /**
  * returns true if pasting 2 preprocessing tokens next to each other
  * without a space in between would generate (an)other preprocessing token(s)
  */
-bool tokens_would_paste(preprocessor_token_type_t token1,
-                        preprocessor_token_type_t token2);
+bool tokens_would_paste(preprocessor_token_kind_t token1,
+                        preprocessor_token_kind_t token2);
 
 #endif