X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=token_t.h;h=20c64ad06c10a77b916e3050952cffecefab04b5;hb=296ba6e16420b89723d1a5b1217d6ecfc2fb0c7d;hp=ab49825c17d030a0bedd4d33847d50f0b4ae0a9a;hpb=3a75131289ed543970968244180a5b828608b342;p=cparser

diff --git a/token_t.h b/token_t.h
index ab49825..20c64ad 100644
--- a/token_t.h
+++ b/token_t.h
@@ -28,26 +28,21 @@
 
 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_kind_tag_t;
+typedef unsigned short token_kind_t;
 
-typedef enum preprocessor_token_kind_tag_t {
-	TP_NULL  = T_NULL,
-	TP_EOF   = T_EOF,
-#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_kind_tag_t;
-typedef unsigned short token_kind_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 {
@@ -57,12 +52,15 @@ struct source_position_t {
 	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 token_base_t token_base_t;
-typedef struct literal_t    literal_t;
-typedef union  token_t      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;
@@ -75,10 +73,16 @@ struct literal_t {
 	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;
+	unsigned          kind;
+	token_base_t      base;
+	literal_t         literal;
+	macro_parameter_t macro_parameter;
 };
 
 char const *get_string_encoding_prefix(string_encoding_t);
@@ -88,9 +92,6 @@ void exit_tokens(void);
 void print_token_kind(FILE *out, token_kind_t token_kind);
 void print_token(FILE *out, const token_t *token);
 
-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)