type: Make an assert()ion independent of the last entry of an enum.

[cparser] / token_t.h

diff --git a/token_t.h b/token_t.h
index 06b7c86..ddca6dc 100644 (file)
--- a/token_t.h
+++ b/token_t.h
@@ -1,21 +1,6 @@
 /*
  * This file is part of cparser.
- * 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
- * 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.
+ * Copyright (C) 2012 Matthias Braun <matze@braunis.de>
  */
 #ifndef TOKEN_T_H
 #define TOKEN_T_H
@@ -28,10 +13,8 @@
 
 typedef enum token_kind_tag_t {
        T_NULL  =  0,
-#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;
@@ -46,8 +29,8 @@ typedef enum pp_token_kind_tag_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 {
+typedef struct position_t position_t;
+struct position_t {
        const char *input_name;
        unsigned    lineno;
        unsigned    colno            : 31;
@@ -57,16 +40,17 @@ struct source_position_t {
 extern symbol_t *token_symbols[];
 
 /* position used for "builtin" declarations/types */
-extern const source_position_t builtin_source_position;
+extern const position_t builtin_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;
-       source_position_t source_position;
-       symbol_t         *symbol;
+       token_kind_t kind;
+       position_t   pos;
+       symbol_t    *symbol;
 };
 
 struct literal_t {
@@ -74,10 +58,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);