Do not consider alignment in the type hash. It is just wrong.

[cparser] / token_t.h

diff --git a/token_t.h b/token_t.h
index 822d666..ecd26bb 100644 (file)
--- a/token_t.h
+++ b/token_t.h
@@ -1,3 +1,22 @@
+/*
+ * This file is part of cparser.
+ * Copyright (C) 2007-2008 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
 #ifndef TOKEN_T_H
 #define TOKEN_T_H
 
@@ -7,23 +26,28 @@
 #include "symbol_table.h"
 #include "type.h"
 
-typedef enum {
-#define T(x,str,val) T_##x val,
+typedef enum token_type_t {
+       T_ERROR = -1,
+       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_EOF   = -1,
-       T_ERROR = -2
+       T_LAST_TOKEN
 } token_type_t;
 
-typedef enum {
-#define T(x,str,val) TP_##x val,
+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,
 #include "tokens_preprocessor.inc"
 #undef TS
 #undef T
+       TP_LAST_TOKEN
 } preprocessor_token_type_t;
 
 typedef struct source_position_t source_position_t;
@@ -33,7 +57,7 @@ struct source_position_t {
 };
 
 /* position used for "builtin" declarations/types */
-extern source_position_t builtin_source_position;
+extern const source_position_t builtin_source_position;
 
 typedef struct {
        int type;
@@ -41,7 +65,7 @@ typedef struct {
                symbol_t      *symbol;
                long long      intvalue;
                long double    floatvalue;
-               const char    *string;
+               string_t       string;
                wide_string_t  wide_string;
        } v;
        type_t            *datatype;
@@ -53,4 +77,7 @@ 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, int type);
+void print_pp_token(FILE *out, const token_t *token);
+
 #endif