* gengtype-lex.l: Allow declarations to be indented.

From-SVN: r126615

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 462bbb0d0ab4b60574761d9f79bdfc91f7ec3942..7b277375cc592108f7f53dfb835fa141d712eb89 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2007-07-13  Andreas Schwab  <schwab@suse.de>
+
+       * gengtype-lex.l: Allow declarations to be indented.
+
 2007-07-12  Geoffrey Keating  <geoffk@apple.com>
 
        * ginclude/tgmath.h: New.

diff --git a/gcc/gengtype-lex.l b/gcc/gengtype-lex.l
index 2d003e0c5fa7d12793076f6c192ce1de07b334ce..05c0c0418ebe23eaa52b1997658cc44cc53804ce 100644 (file)
--- a/gcc/gengtype-lex.l
+++ b/gcc/gengtype-lex.l
@@ -65,36 +65,36 @@ EOID        [^[:alnum:]_]
 
   /* Things we look for in skipping mode: */
 <INITIAL>{
-^typedef/{EOID} {
+^{HWS}typedef/{EOID} {
   BEGIN(in_struct);
   return TYPEDEF;
 }
-^struct/{EOID} {
+^{HWS}struct/{EOID} {
   BEGIN(in_struct);
   return STRUCT;
 }
-^union/{EOID} {
+^{HWS}union/{EOID} {
   BEGIN(in_struct);
   return UNION;
 }
-^extern/{EOID} {
+^{HWS}extern/{EOID} {
   BEGIN(in_struct);
   return EXTERN;
 }
-^static/{EOID} {
+^{HWS}static/{EOID} {
   BEGIN(in_struct);
   return STATIC;
 }
 
-^DEF_VEC_[OP]/{EOID} {
+^{HWS}DEF_VEC_[OP]/{EOID} {
   BEGIN(in_struct);
   return DEFVEC_OP;
 }
-^DEF_VEC_I/{EOID} {
+^{HWS}DEF_VEC_I/{EOID} {
   BEGIN(in_struct);
   return DEFVEC_I;
 }
-^DEF_VEC_ALLOC_[IOP]/{EOID} {
+^{HWS}DEF_VEC_ALLOC_[IOP]/{EOID} {
   BEGIN(in_struct);
   return DEFVEC_ALLOC;
 }
@@ -186,7 +186,7 @@ EOID        [^[:alnum:]_]
                 "unterminated comment or string; unexpected EOF");
 }
 
-^"#define"{WS}"GTY(" /* do nothing */
+^{HWS}"#"{HWS}"define"{WS}"GTY(" /* do nothing */
 {WS}"GTY"{WS}?"("      {
   error_at_line (&lexer_line, "stray GTY marker");
 }