From: Andreas Schwab Date: Fri, 13 Jul 2007 09:12:13 +0000 (+0000) Subject: * gengtype-lex.l: Allow declarations to be indented. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=36f568c3870c0e06b0ab5a54745683979e313365;p=gcc.git * gengtype-lex.l: Allow declarations to be indented. From-SVN: r126615 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 462bbb0d0ab..7b277375cc5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2007-07-13 Andreas Schwab + + * gengtype-lex.l: Allow declarations to be indented. + 2007-07-12 Geoffrey Keating * ginclude/tgmath.h: New. diff --git a/gcc/gengtype-lex.l b/gcc/gengtype-lex.l index 2d003e0c5fa..05c0c0418eb 100644 --- a/gcc/gengtype-lex.l +++ b/gcc/gengtype-lex.l @@ -65,36 +65,36 @@ EOID [^[:alnum:]_] /* Things we look for in skipping mode: */ { -^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"); }