summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2018-09-10 16:48:10 (GMT)
committerGitHub <noreply@github.com>2018-09-10 16:48:10 (GMT)
commit4a1964105a74beb857a877928d264261ab8c1e77 (patch)
tree8bb930aa67568d32d1844039629c3fae3bc4c892
parentfd0d0b5902cfd4a748d1834d2ee8442a79d13184 (diff)
parenteef433c0531f8f5321f3034bcc5bed02c006f2cf (diff)
downloadDoxygen-4a1964105a74beb857a877928d264261ab8c1e77.zip
Doxygen-4a1964105a74beb857a877928d264261ab8c1e77.tar.gz
Doxygen-4a1964105a74beb857a877928d264261ab8c1e77.tar.bz2
Merge pull request #6496 from albert-github/feature/issue_6494
Issue 6494: asterisks before args and kwargs are ignored in python
-rw-r--r--src/pyscanner.l7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/pyscanner.l b/src/pyscanner.l
index 2adf632..7b5a424 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