diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2012-04-08 14:16:03 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2012-04-08 14:16:03 (GMT) |
| commit | 17ee30b327bf4f07f2411a50a46f5467456beacf (patch) | |
| tree | ffd092e761289b417363c0562ceb9b93b88f19a4 /src/defargs.l | |
| parent | 0039b4f79ad7e628dcab61e1d82f26fb8fa11cfe (diff) | |
| download | Doxygen-17ee30b327bf4f07f2411a50a46f5467456beacf.zip Doxygen-17ee30b327bf4f07f2411a50a46f5467456beacf.tar.gz Doxygen-17ee30b327bf4f07f2411a50a46f5467456beacf.tar.bz2 | |
Release-1.8.0-20120408
Diffstat (limited to 'src/defargs.l')
| -rw-r--r-- | src/defargs.l | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/defargs.l b/src/defargs.l index acada87..7044cc6 100644 --- a/src/defargs.l +++ b/src/defargs.l @@ -275,7 +275,7 @@ ID [a-z_A-Z\x80-\xFF][a-z_A-Z0-9\x80-\xFF]* { int i=l-1; while (i>=0 && (isspace((uchar)g_curArgTypeName.at(i)) || g_curArgTypeName.at(i)=='.')) i--; - while (i>=0 && isId(g_curArgTypeName.at(i))) i--; + while (i>=0 && (isId(g_curArgTypeName.at(i)) || g_curArgTypeName.at(i)=='$')) i--; Argument *a = new Argument; a->attrib = g_curArgAttrib.copy(); //printf("a->type=%s a->name=%s i=%d l=%d\n", @@ -327,6 +327,11 @@ ID [a-z_A-Z\x80-\xFF][a-z_A-Z0-9\x80-\xFF]* { a->type = removeRedundantWhiteSpace(g_curArgTypeName); } + if (!a->type.isEmpty() && a->type.at(0)=='$') // typeless PHP name? + { + a->name = a->type; + a->type = ""; + } a->array += removeRedundantWhiteSpace(g_curArgArray); //printf("array=%s\n",a->array.data()); int alen = a->array.length(); @@ -363,7 +368,7 @@ ID [a-z_A-Z\x80-\xFF][a-z_A-Z0-9\x80-\xFF]* } } } -<ReadFuncArgType,ReadFuncArgPtr>{ID} { +<ReadFuncArgType,ReadFuncArgPtr>"$"?{ID} { QCString name=yytext; //resolveDefines(yytext); if (YY_START==ReadFuncArgType && g_curArgArray=="[]") // Java style array { |