diff options
-rw-r--r-- | src/doctokenizer.l | 3 | ||||
-rw-r--r-- | src/util.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/doctokenizer.l b/src/doctokenizer.l index 52e30ac..a33985b 100644 --- a/src/doctokenizer.l +++ b/src/doctokenizer.l @@ -355,6 +355,7 @@ INOUT "inout"|"in"|"out"|("in"{BLANK}*","{BLANK}*"out")|("out"{BLANK}*","{BLAN PARAMIO {CMD}param{BLANK}*"["{BLANK}*{INOUT}{BLANK}*"]" TEMPCHAR [a-z_A-Z0-9.,: \t\*\&\(\)\[\]] FUNCCHAR [a-z_A-Z0-9,:\<\> \t\^\*\&\[\]] +FUNCPART {FUNCCHAR}*("("{FUNCCHAR}*")"{FUNCCHAR}*)? SCOPESEP "::"|"#"|"." TEMPLPART "<"{TEMPCHAR}*">" ANONNS "anonymous_namespace{"[^}]*"}" @@ -363,7 +364,7 @@ SCOPEKEYS ":"({ID}":")* SCOPECPP {SCOPEPRE}*(~)?{ID}{TEMPLPART}? SCOPEOBJC {SCOPEPRE}?{ID}{SCOPEKEYS}? SCOPEMASK {SCOPECPP}|{SCOPEOBJC} -FUNCARG "("{FUNCCHAR}*")"({BLANK}*("volatile"|"const"){BLANK})? +FUNCARG "("{FUNCPART}")"({BLANK}*("volatile"|"const"){BLANK})? OPNEW {BLANK}+"new"({BLANK}*"[]")? OPDEL {BLANK}+"delete"({BLANK}*"[]")? OPNORM {OPNEW}|{OPDEL}|"+"|"-"|"*"|"/"|"%"|"^"|"&"|"|"|"~"|"!"|"="|"<"|">"|"+="|"-="|"*="|"/="|"%="|"^="|"&="|"|="|"<<"|">>"|"<<="|">>="|"=="|"!="|"<="|">="|"&&"|"||"|"++"|"--"|","|"->*"|"->"|"[]"|"()" diff --git a/src/util.cpp b/src/util.cpp index cf1c1f1..e67e9fb 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -1872,7 +1872,8 @@ int findParameterList(const QString &name) } else { - return bracePos; + int bp = bracePos>0 ? name.findRev('(',bracePos-1) : -1; + return bp==-1 ? bracePos : bp; } } } while (pos!=-1); |