* c-common.h (enum rid): Remove RID_BOUNDED, RID_UNBOUNDED.

[pf3gnuchains/gcc-fork.git] / gcc / gengtype-lex.l

diff --git a/gcc/gengtype-lex.l b/gcc/gengtype-lex.l
index bd848a7..36b1596 100644 (file)
--- a/gcc/gengtype-lex.l
+++ b/gcc/gengtype-lex.l
@@ -20,11 +20,13 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.  */
 
 %{
+#include "bconfig.h"
+#include "coretypes.h"
+#include "system.h"
+
 #define malloc xmalloc
 #define realloc xrealloc
 
-#include "hconfig.h"
-#include "system.h"
 #include "gengtype.h"
 #include "gengtype-yacc.h"
 
@@ -50,7 +52,7 @@ update_lineno (l, len)
 
 ID     [[:alpha:]_][[:alnum:]_]*
 WS     [[:space:]]+
-IWORD  short|long|(un)?signed|char|int|HOST_WIDE_INT|bool|size_t
+IWORD  short|long|(un)?signed|char|int|HOST_WIDE_INT|bool|size_t|CHAR_BITFIELD
 ITYPE  {IWORD}({WS}{IWORD})*
 
 %x in_struct in_struct_comment in_comment in_yacc_escape
@@ -203,8 +205,11 @@ ITYPE      {IWORD}({WS}{IWORD})*
 "struct"/[^[:alnum:]_]         { return STRUCT; }
 "enum"/[^[:alnum:]_]           { return ENUM; }
 "ptr_alias"/[^[:alnum:]_]      { return ALIAS; }
-"param_is"/[^[:alnum:]_]       { return PARAM_IS; }
 [0-9]+                         { return NUM; }
+"param"[0-9]*"_is"/[^[:alnum:]_]               { 
+  yylval.s = xmemdup (yytext, yyleng, yyleng+1);
+  return PARAM_IS;
+}
 
 {IWORD}({WS}{IWORD})*/[^[:alnum:]_]            |
 "ENUM_BITFIELD"{WS}?"("{WS}?{ID}{WS}?")"       {