X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=token_t.h;h=20c64ad06c10a77b916e3050952cffecefab04b5;hb=d7384b0b065dd6195ac6649c4d48a06905bc8fe7;hp=6987f4ce7dd85da9c51250e3eebededc1f69e5ec;hpb=76607fad56fb6eb22d9b831e6cfacce916a89cbf;p=cparser

diff --git a/token_t.h b/token_t.h
index 6987f4c..20c64ad 100644
--- a/token_t.h
+++ b/token_t.h
@@ -26,54 +26,76 @@
 #include "symbol_table.h"
 #include "type.h"
 
-typedef enum token_type_t {
-	T_ERROR = -1,
+typedef enum token_kind_tag_t {
 	T_NULL  =  0,
-	T_EOF   = '\x04', // EOT
-#define T(mode,x,str,val) T_##x val,
-#define TS(x,str,val) T_##x val,
+#define T(mode,x,str,val) x val,
 #include "tokens.inc"
-#undef TS
 #undef T
 	T_LAST_TOKEN
-} token_type_t;
+} token_kind_tag_t;
+typedef unsigned short token_kind_t;
 
-typedef enum preprocessor_token_type_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,
+typedef enum pp_token_kind_tag_t {
+	TP_NULL = 0,
+#define T(token) TP_##token,
 #include "tokens_preprocessor.inc"
-#undef TS
 #undef T
 	TP_LAST_TOKEN
-} preprocessor_token_type_t;
+} pp_token_kind_tag_t;
+typedef unsigned short pp_token_kind_t;
 
 typedef struct source_position_t source_position_t;
 struct source_position_t {
 	const char *input_name;
 	unsigned    lineno;
+	unsigned    colno            : 31;
+	unsigned    is_system_header : 1;
 };
 
+extern symbol_t *token_symbols[];
+
 /* 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 literal_t         literal_t;
+typedef struct macro_parameter_t macro_parameter_t;
+typedef union  token_t           token_t;
+
+struct token_base_t {
+	token_kind_t      kind;
+	source_position_t source_position;
+	symbol_t         *symbol;
+};
+
+struct literal_t {
+	token_base_t base;
+	string_t     string;
+};
+
+struct macro_parameter_t {
+	token_base_t     base;
+	pp_definition_t *def;
+};
+
+union token_t {
+	unsigned          kind;
+	token_base_t      base;
+	literal_t         literal;
+	macro_parameter_t macro_parameter;
+};
+
+char const *get_string_encoding_prefix(string_encoding_t);
 
 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(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(token_kind_t token1, token_kind_t token2);
 
 #endif