diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2018-09-15 16:01:49 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-15 16:01:49 (GMT) |
| commit | c6892316233d5c03b1b2ce3ccff7ea9e36dbf628 (patch) | |
| tree | 610f7ae30be2dec7f53fcee2ff966c6133fd8540 /src/pyscanner.l | |
| parent | 8176639e13357f74d317c631a5bf01a60bb543af (diff) | |
| parent | 6c1c88f41aa68e6999bfa4b72e37c5a8034588a5 (diff) | |
| download | Doxygen-c6892316233d5c03b1b2ce3ccff7ea9e36dbf628.zip Doxygen-c6892316233d5c03b1b2ce3ccff7ea9e36dbf628.tar.gz Doxygen-c6892316233d5c03b1b2ce3ccff7ea9e36dbf628.tar.bz2 | |
Merge branch 'master' into feature/bug_tests_extensions
Diffstat (limited to 'src/pyscanner.l')
| -rw-r--r-- | src/pyscanner.l | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/pyscanner.l b/src/pyscanner.l index 2adf632..3743712 100644 --- a/src/pyscanner.l +++ b/src/pyscanner.l @@ -118,6 +118,7 @@ static bool g_packageCommentAllowed; static bool g_start_init = FALSE; static int g_search_count = 0; +static QCString g_argType = ""; //----------------------------------------------------------------------------- @@ -959,12 +960,16 @@ STARTDOCSYMS "##" ({BB}|",") { } + [\*]+ { + g_argType = yytext; + } {IDENTIFIER} { // Name of parameter lineCount(); Argument *a = new Argument; current->argList->append(a); current->argList->getLast()->name = QCString(yytext).stripWhiteSpace(); - current->argList->getLast()->type = ""; + current->argList->getLast()->type = g_argType; + g_argType = ""; } "=" { // default value // TODO: this rule is too simple, need to be able to @@ -1396,7 +1401,6 @@ STARTDOCSYMS "##" BEGIN(Search); } <<EOF>> { yyterminate(); - newEntry(); } } @@ -1425,7 +1429,7 @@ STARTDOCSYMS "##" actualDoc.prepend("\\verbatim "); actualDoc.append("\\endverbatim "); } - actualDoc.prepend("\\namespace "+g_moduleScope+"\\_linebr "); + actualDoc.prepend("\\namespace "+g_moduleScope+" "); handleCommentBlock(actualDoc, FALSE); } if ((docBlockContext==ClassBody /*&& !g_hideClassDocs*/) || |