X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=token_t.h;h=831afd7bad0b33607fa5da3dae08d58737f391df;hb=3f3626e6201bcee6887faa3f206a3d73c152f37d;hp=5a082fdd7b0fa027272269bc602514814456ec40;hpb=fd16b92f058181088a385c3224c8814831c006d3;p=cparser

diff --git a/token_t.h b/token_t.h
index 5a082fd..831afd7 100644
--- a/token_t.h
+++ b/token_t.h
@@ -1,6 +1,6 @@
 /*
  * This file is part of cparser.
- * Copyright (C) 2007-2008 Matthias Braun <matze@braunis.de>
+ * Copyright (C) 2007-2009 Matthias Braun <matze@braunis.de>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -26,50 +26,87 @@
 #include "symbol_table.h"
 #include "type.h"
 
-typedef enum {
+typedef enum token_kind_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,
 #include "tokens.inc"
 #undef TS
 #undef T
+	T_LAST_TOKEN
+} token_kind_t;
 
-	T_EOF   = -1,
-	T_ERROR = -2
-} token_type_t;
-
-typedef enum {
+typedef enum preprocessor_token_kind_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,
 #include "tokens_preprocessor.inc"
 #undef TS
 #undef T
-} preprocessor_token_type_t;
+	TP_LAST_TOKEN
+} preprocessor_token_kind_t;
 
 typedef struct source_position_t source_position_t;
 struct source_position_t {
 	const char *input_name;
-	unsigned    linenr;
+	unsigned    lineno;
+	unsigned    colno            : 31;
+	unsigned    is_system_header : 1;
 };
 
 /* position used for "builtin" declarations/types */
-extern source_position_t builtin_source_position;
+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 {
+	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;
+};
 
-typedef struct {
-	int type;
-	union {
-		symbol_t      *symbol;
-		long long      intvalue;
-		long double    floatvalue;
-		string_t       string;
-		wide_string_t  wide_string;
-	} v;
-	type_t            *datatype;
-	source_position_t  source_position;
-} token_t;
+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);
 
+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_kind_t token1,
+                        preprocessor_token_kind_t token2);
+
 #endif