aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKelley Cook <kelleycook@wideopenwest.com>2003-10-05 02:49:20 +0000
committerR. Kelley Cook <kcook@gcc.gnu.org>2003-10-05 02:49:20 +0000
commit790ca6641b98da56819b89ed36c46179e5897f3f (patch)
treef43c04b0e53f0298296fa1a0051cab9bbdeef052
parentd72c6c58a98050c3897d2409a964a4c2ad134c3d (diff)
downloadgcc-790ca6641b98da56819b89ed36c46179e5897f3f.zip
gcc-790ca6641b98da56819b89ed36c46179e5897f3f.tar.gz
gcc-790ca6641b98da56819b89ed36c46179e5897f3f.tar.bz2
* gengtype-lex.l: Recognize typedef of functions without PARAMS macro.
From-SVN: r72106
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/gengtype-lex.l33
2 files changed, 37 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e320192..4ec5629 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2003-10-04 Kelley Cook <kelleycook@wideopenwest.com>
+
+ * gengtype-lex.l: Recognize typedef of functions without PARAMS macro.
+
2003-10-04 Nathanael Nerode <neroden@gcc.gnu.org>
* config/v850/v850-c.c, config/v850/v850-protos.h, config/v850/v850.c:
diff --git a/gcc/gengtype-lex.l b/gcc/gengtype-lex.l
index bbdf991..5af585e 100644
--- a/gcc/gengtype-lex.l
+++ b/gcc/gengtype-lex.l
@@ -132,6 +132,23 @@ ITYPE {IWORD}({WS}{IWORD})*
do_typedef (xmemdup (namestart, namelen, namelen+1), t, &lexer_line);
update_lineno (yytext, yyleng);
}
+
+[^[:alnum:]_]typedef{WS}{ID}{WS}{ID}{WS}"(" {
+ char *namestart;
+ size_t namelen;
+ struct type *t;
+
+ for (namestart = yytext + yyleng - 2; 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);
+}
+
[^[:alnum:]_]typedef{WS}{ID}{WS}?"("{WS}?"*"{WS}?{ID}{WS}?")"{WS}?PARAMS {
char *namestart;
size_t namelen;
@@ -148,6 +165,22 @@ ITYPE {IWORD}({WS}{IWORD})*
update_lineno (yytext, yyleng);
}
+[^[:alnum:]_]typedef{WS}{ID}{WS}?"("{WS}?"*"{WS}?{ID}{WS}?")"{WS}?"(" {
+ char *namestart;
+ size_t namelen;
+ struct type *t;
+
+ for (namestart = yytext + yyleng - 2; !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);
+}
+
[^[:alnum:]_](typedef{WS})?(struct|union){WS}{ID}{WS}/"GTY" {
char *tagstart;
size_t taglen;