Merge T_WIDE_CHARACTER_CONSTANT into T_CHARACTER_CONSTANT.

[cparser] / token_t.h

diff --git a/token_t.h b/token_t.h
index 2f2918d..9a68f81 100644 (file)
--- a/token_t.h
+++ b/token_t.h
@@ -27,7 +27,6 @@
 #include "type.h"
 
 typedef enum token_kind_t {
-       T_ERROR = -1,
        T_NULL  =  0,
        T_EOF   = '\x04', // EOT
 #define T(mode,x,str,val) T_##x val,
@@ -41,7 +40,6 @@ typedef enum token_kind_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"
@@ -54,31 +52,34 @@ 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 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 {
-       int               kind;
+       unsigned          kind;
        source_position_t source_position;
+       symbol_t         *symbol;
 };
 
-struct identifier_t {
-       token_base_t  base;
-       symbol_t     *symbol;
+enum string_encoding_t {
+       STRING_ENCODING_CHAR,
+       STRING_ENCODING_WIDE
 };
+typedef enum string_encoding_t string_encoding_t;
 
 struct string_literal_t {
-       token_base_t  base;
-       string_t      string;
+       token_base_t      base;
+       string_encoding_t encoding;
+       string_t          string;
 };
 
 struct number_literal_t {
@@ -88,20 +89,19 @@ struct number_literal_t {
 };
 
 union token_t {
-       int               kind;
+       unsigned          kind;
        token_base_t      base;
-       identifier_t      identifier;
        string_literal_t  string;
        number_literal_t  number;
 };
 
+char const *get_string_encoding_prefix(string_encoding_t);
+
 void init_tokens(void);
 void exit_tokens(void);
 void print_token_kind(FILE *out, token_kind_t token_kind);
 void print_token(FILE *out, const token_t *token);
 
-symbol_t *get_token_kind_symbol(int token_kind);
-
 void print_pp_token_kind(FILE *out, int kind);
 void print_pp_token(FILE *out, const token_t *token);