X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fgengtype-lex.l;h=822c84cbed40613ed2544b34158ba0d019aedd09;hb=bf3e1520c00cff0abcd998aac1c85f084f162d3e;hp=6a212627bc1ad73774843d491a2fbf93febe60f6;hpb=6e0ed7a2ec845c3beecc397b5064d66be891df6e;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/gcc/gengtype-lex.l b/gcc/gengtype-lex.l
index 6a212627bc1..822c84cbed4 100644
--- a/gcc/gengtype-lex.l
+++ b/gcc/gengtype-lex.l
@@ -1,12 +1,12 @@
 /* -*- indented-text -*- */
 /* Process source files and output type information.
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
 GCC 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, or (at your option) any later
+Software Foundation; either version 3, or (at your option) any later
 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY
@@ -15,28 +15,26 @@ 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 GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */
 
 %{
+#include "bconfig.h"
+#include "system.h"
+
 #define malloc xmalloc
 #define realloc xrealloc
 
-#include "hconfig.h"
-#include "system.h"
 #include "gengtype.h"
-#include "gengtype-yacc.h"
 
-static void update_lineno PARAMS ((const char *l, size_t len));
+#define YY_DECL int yylex (const char **yylval)
+#define yyterminate() return EOF_TOKEN
 
 struct fileloc lexer_line;
 int lexer_toplevel_done;
 
 static void 
-update_lineno (l, len)
-     const char *l;
-     size_t len;
+update_lineno (const char *l, size_t len)
 {
   while (len-- > 0)
     if (*l++ == '\n')
@@ -45,213 +43,120 @@ update_lineno (l, len)
 
 %}
 
-ID	[[:alpha:]][[:alnum:]_]*
+ID	[[:alpha:]_][[:alnum:]_]*
 WS	[[:space:]]+
-IWORD	short|long|(un)?signed|char|int|HOST_WIDE_INT|bool|size_t
+HWS	[ \t\r\v\f]*
+IWORD	short|long|(un)?signed|char|int|HOST_WIDE_INT|HOST_WIDEST_INT|bool|size_t|BOOL_BITFIELD|CPPCHAR_SIGNED_T|ino_t|dev_t
 ITYPE	{IWORD}({WS}{IWORD})*
+EOID	[^[:alnum:]_]
 
-%x in_struct in_struct_comment in_comment in_yacc_escape
+%x in_struct in_struct_comment in_comment
 %option warn noyywrap nounput nodefault perf-report
 %option 8bit never-interactive
 %%
+  /* Do this on entry to yylex():  */
+  *yylval = 0;
+  if (lexer_toplevel_done)
+    {
+      BEGIN(INITIAL);
+      lexer_toplevel_done = 0;
+    }
 
-[^[:alnum:]_]typedef{WS}(struct|union){WS}{ID}{WS}?[*[:space:]]{WS}?{ID}{WS}?";" {
-  char *tagstart;
-  size_t taglen;
-  char *namestart;
-  size_t namelen;
-  int is_pointer = 0;
-  struct type *t;
-  int union_p;
-
-  tagstart = yytext + strlen (" typedef ");
-  while (ISSPACE (*tagstart))
-    tagstart++;
-  union_p = tagstart[0] == 'u';
-  tagstart += strlen ("union ");
-  while (ISSPACE (*tagstart))
-    tagstart++;
-  for (taglen = 1; ISIDNUM (tagstart[taglen]); taglen++)
-    ;
-  for (namestart = tagstart + taglen; 
-       ! ISIDNUM (*namestart);
-       namestart++)
-    if (*namestart == '*')
-      is_pointer = 1;
-  for (namelen = 1; ISIDNUM (namestart[namelen]); namelen++)
-    ;
-  t = find_structure (xmemdup (tagstart, taglen, taglen+1), union_p);
-  if (is_pointer)
-    t = create_pointer (t);
-  do_typedef (xmemdup (namestart, namelen, namelen+1), t, &lexer_line);
-  update_lineno (yytext, yyleng);
+  /* Things we look for in skipping mode: */
+<INITIAL>{
+^{HWS}typedef/{EOID} {
+  BEGIN(in_struct);
+  return TYPEDEF;
 }
-
-[^[:alnum:]_]typedef{WS}{ITYPE}{WS}{ID}{WS}?";" {
-
-  char *namestart;
-  size_t namelen;
-  struct type *t;
-  char *typestart;
-  size_t typelen;
-
-  for (namestart = yytext + yyleng - 2; ISSPACE (*namestart); namestart--)
-    ;
-  for (namelen = 1; !ISSPACE (namestart[-namelen]); namelen++)
-    ;
-  namestart -= namelen - 1;
-  for (typestart = yytext + strlen (" typedef "); 
-       ISSPACE(*typestart);
-       typestart++)
-    ;
-  for (typelen = namestart - typestart; 
-       ISSPACE(typestart[typelen-1]); 
-       typelen--)
-    ;
-
-  t = create_scalar_type (typestart, typelen);
-  do_typedef (xmemdup (namestart, namelen, namelen+1), t, &lexer_line);
-  update_lineno (yytext, yyleng);
+^{HWS}struct/{EOID} {
+  BEGIN(in_struct);
+  return STRUCT;
 }
-
-[^[:alnum:]_]typedef{WS}{ID}{WS}{ID}{WS}PARAMS {
-  char *namestart;
-  size_t namelen;
-  struct type *t;
-
-  for (namestart = yytext + yyleng - 7; ISSPACE (*namestart); namestart--)
-    ;
-  for (namelen = 1; !ISSPACE (namestart[-namelen]); namelen++)
-    ;
-  namestart -= namelen - 1;
-
-  t = create_scalar_type ("function type", sizeof ("function type")-1);
-  do_typedef (xmemdup (namestart, namelen, namelen+1), t, &lexer_line);
-  update_lineno (yytext, yyleng);
+^{HWS}union/{EOID} {
+  BEGIN(in_struct);
+  return UNION;
 }
-[^[:alnum:]_]typedef{WS}{ID}{WS}?"("{WS}?"*"{WS}?{ID}{WS}?")"{WS}?PARAMS {
-  char *namestart;
-  size_t namelen;
-  struct type *t;
-
-  for (namestart = yytext + yyleng - 7; !ISIDNUM (*namestart); namestart--)
-    ;
-  for (namelen = 1; ISIDNUM (namestart[-namelen]); namelen++)
-    ;
-  namestart -= namelen - 1;
-
-  t = create_scalar_type ("function type", sizeof ("function type")-1);
-  do_typedef (xmemdup (namestart, namelen, namelen+1), t, &lexer_line);
-  update_lineno (yytext, yyleng);
+^{HWS}extern/{EOID} {
+  BEGIN(in_struct);
+  return EXTERN;
 }
-
-[^[:alnum:]_](typedef{WS})?(struct|union){WS}{ID}{WS}/"GTY" {
-  char *tagstart;
-  size_t taglen;
-  int typedef_p;
-  int union_p;
-
-  typedef_p = yytext[1] == 't';
-  if (typedef_p)
-    for (tagstart = yytext + strlen (" typedef "); 
-	 ISSPACE(*tagstart);
-	 tagstart++)
-      ;
-  else
-    tagstart = yytext + 1;
-
-  union_p = tagstart[0] == 'u';
-  tagstart += strlen ("union ");
-  while (ISSPACE (*tagstart))
-    tagstart++;
-  for (taglen = 1; ISIDNUM (tagstart[taglen]); taglen++)
-    ;
-
-  yylval.t = find_structure (xmemdup (tagstart, taglen, taglen + 1), union_p);
+^{HWS}static/{EOID} {
   BEGIN(in_struct);
-  update_lineno (yytext, yyleng);
-  return typedef_p ? ENT_TYPEDEF_STRUCT : ENT_STRUCT;
+  return STATIC;
 }
 
-[^[:alnum:]_](extern|static){WS}/"GTY" {
+^{HWS}DEF_VEC_[OP]/{EOID} {
   BEGIN(in_struct);
-  update_lineno (yytext, yyleng);
-  return ENT_EXTERNSTATIC;
+  return DEFVEC_OP;
 }
-
-^"%union"{WS}"{"{WS}/"GTY" {
+^{HWS}DEF_VEC_I/{EOID} {
   BEGIN(in_struct);
-  update_lineno (yytext, yyleng);
-  return ENT_YACCUNION;
+  return DEFVEC_I;
+}
+^{HWS}DEF_VEC_ALLOC_[IOP]/{EOID} {
+  BEGIN(in_struct);
+  return DEFVEC_ALLOC;
+}
 }
 
 <in_struct>{
 
 "/*"				{ BEGIN(in_struct_comment); }
 
-^"%{"				{ BEGIN(in_yacc_escape); }
-
 {WS}				{ update_lineno (yytext, yyleng); }
-
-"const"/[^[:alnum:]_]		/* don't care */
-
-"GTY"/[^[:alnum:]_]		{ return GTY_TOKEN; }
-"union"/[^[:alnum:]_]		{ return UNION; }
-"struct"/[^[:alnum:]_]		{ return STRUCT; }
-"enum"/[^[:alnum:]_]		{ return ENUM; }
-"ptr_alias"/[^[:alnum:]_]	{ return ALIAS; }
-"param_is"/[^[:alnum:]_]	{ return PARAM_IS; }
+\\\n				{ lexer_line.line++; }
+
+"const"/{EOID}			/* don't care */
+"GTY"/{EOID}			{ return GTY_TOKEN; }
+"VEC"/{EOID}			{ return VEC_TOKEN; }
+"union"/{EOID}			{ return UNION; }
+"struct"/{EOID}			{ return STRUCT; }
+"enum"/{EOID}			{ return ENUM; }
+"ptr_alias"/{EOID}	  	{ return PTR_ALIAS; }
+"nested_ptr"/{EOID}		{ return NESTED_PTR; }
 [0-9]+				{ return NUM; }
+"param"[0-9]*"_is"/{EOID}		{
+  *yylval = XDUPVAR (const char, yytext, yyleng, yyleng+1);
+  return PARAM_IS;
+}
 
-{IWORD}({WS}{IWORD})*/[^[:alnum:]_]		|
+{IWORD}({WS}{IWORD})*/{EOID}		|
 "ENUM_BITFIELD"{WS}?"("{WS}?{ID}{WS}?")"	{
   size_t len;
 
   for (len = yyleng; ISSPACE (yytext[len-1]); len--)
     ;
 
-  yylval.t = create_scalar_type (yytext, len);
+  *yylval = XDUPVAR (const char, yytext, len, len+1);
   update_lineno (yytext, yyleng);
   return SCALAR;
 }
 
-{ID}/[^[:alnum:]_]		{
-  yylval.s = xmemdup (yytext, yyleng, yyleng+1);
+
+{ID}/{EOID}			{
+  *yylval = XDUPVAR (const char, yytext, yyleng, yyleng+1);
   return ID;
 }
 
 \"([^"\\]|\\.)*\"		{
-  yylval.s = xmemdup (yytext+1, yyleng-2, yyleng-1);
+  *yylval = XDUPVAR (const char, yytext+1, yyleng-2, yyleng-1);
   return STRING;
 }
+  /* This "terminal" avoids having to parse integer constant expressions.  */
 "["[^\[\]]*"]"			{
-  yylval.s = xmemdup (yytext+1, yyleng-2, yyleng-1);
+  *yylval = XDUPVAR (const char, yytext+1, yyleng-2, yyleng-1);
   return ARRAY;
 }
-^"%"{ID}			{
-  yylval.s = xmemdup (yytext+1, yyleng-1, yyleng);
-  return PERCENT_ID;
-}
 "'"("\\".|[^\\])"'"		{
-  yylval.s = xmemdup (yytext+1, yyleng-2, yyleng);
+  *yylval = XDUPVAR (const char, yytext+1, yyleng-2, yyleng);
   return CHAR;
 }
 
-[(){},*:<>]			{ return yytext[0]; }
-
-[;=]				{
-  if (lexer_toplevel_done)
-    {
-      BEGIN(INITIAL);
-      lexer_toplevel_done = 0;
-    }
-  return yytext[0];
-}
+"..."				{ return ELLIPSIS; }
+[(){},*:<>;=%|-]		{ return yytext[0]; }
 
-^"%%"				{
-  BEGIN(INITIAL);
-  return PERCENTPERCENT;
-}
+   /* ignore pp-directives */
+^{HWS}"#"{HWS}[a-z_]+[^\n]*\n   {lexer_line.line++;}
 
 .				{
   error_at_line (&lexer_line, "unexpected character `%s'", yytext);
@@ -275,47 +180,34 @@ ITYPE	{IWORD}({WS}{IWORD})*
 <in_comment>"*/"	{ BEGIN(INITIAL); } 
 <in_struct_comment>"*/"	{ BEGIN(in_struct); }
 
-<in_yacc_escape>{
-\n		{ lexer_line.line++; }
-[^%]{16}	|
-[^%]		/* do nothing */
-"%"/[^}]	/* do nothing */
-"%}"		{ BEGIN(in_struct); }
-"%"		{
-  error_at_line (&lexer_line, 
-		 "unterminated %%{; unexpected EOF");
-}
-}
-
-
 ["/]    		|
 <in_struct_comment,in_comment>"*"	{
   error_at_line (&lexer_line, 
 		 "unterminated comment or string; unexpected EOF");
 }
 
-%%
-
-void
-yyerror (s)
-     const char *s;
-{
-  error_at_line (&lexer_line, s);
+^{HWS}"#"{HWS}"define"{WS}"GTY(" /* do nothing */
+{WS}"GTY"{WS}?"("	{
+  error_at_line (&lexer_line, "stray GTY marker");
 }
 
+%%
+
 void
-parse_file (fname)
-      char *fname;
+yybegin (const char *fname)
 {
   yyin = fopen (fname, "r");
-  lexer_line.file = fname;
-  lexer_line.line = 1;
   if (yyin == NULL)
     {
       perror (fname);
       exit (1);
     }
-  if (yyparse() != 0)
-    exit (1);
+  lexer_line.file = fname;
+  lexer_line.line = 1;
+}
+
+void
+yyend (void)
+{
   fclose (yyin);
 }