X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=token_t.h;h=5b40ee35f5067e635e6e125bc9f1df374c3884c8;hb=ccbe0e69128fca7df6be76437483f305c5eba55e;hp=87077e8da63d1d0f6a65e406ff8e5795d8052671;hpb=21dbb2b9c84e8fed04ac38ebe5c0b7778ab666e3;p=cparser

diff --git a/token_t.h b/token_t.h
index 87077e8..5b40ee3 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
@@ -27,9 +27,9 @@
 #include "type.h"
 
 typedef enum token_type_t {
+	T_ERROR = -1,
 	T_NULL  =  0,
-	T_EOF   = -1,
-	T_ERROR = -2,
+	T_EOF   = '\x04', // EOT
 #define T(mode,x,str,val) T_##x val,
 #define TS(x,str,val) T_##x val,
 #include "tokens.inc"
@@ -53,22 +53,17 @@ typedef enum preprocessor_token_type_t {
 typedef struct source_position_t source_position_t;
 struct source_position_t {
 	const char *input_name;
-	unsigned    linenr;
+	unsigned    lineno;
+	unsigned    colno;
 };
 
 /* position used for "builtin" declarations/types */
 extern const source_position_t builtin_source_position;
 
 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;
+	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;
 
@@ -77,7 +72,9 @@ void exit_tokens(void);
 void print_token_type(FILE *out, token_type_t token_type);
 void print_token(FILE *out, const token_t *token);
 
-void print_pp_token_type(FILE *out, preprocessor_token_type_t type);
+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);
 
 #endif