aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@suse.de>2007-07-13 09:12:13 +0000
committerAndreas Schwab <schwab@gcc.gnu.org>2007-07-13 09:12:13 +0000
commit36f568c3870c0e06b0ab5a54745683979e313365 (patch)
treefcebceec84daf76e23fddaf98efb10a28488b84f
parenta2bef74c1bfdea615812953cbbadd6e39ab63f45 (diff)
downloadgcc-36f568c3870c0e06b0ab5a54745683979e313365.zip
gcc-36f568c3870c0e06b0ab5a54745683979e313365.tar.gz
gcc-36f568c3870c0e06b0ab5a54745683979e313365.tar.bz2
* gengtype-lex.l: Allow declarations to be indented.
From-SVN: r126615
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/gengtype-lex.l18
2 files changed, 13 insertions, 9 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 462bbb0..7b27737 100644
--- 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 2d003e0..05c0c04 100644
--- 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");
}