summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2013-09-09 09:51:20 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2013-09-09 09:51:20 (GMT)
commit1e373422387e8c1131f887efb47cf3da6459e2ac (patch)
tree7be906fa7ab6bb3830ed9a92e9487a3bf45927c8
parentbe7ce5002af548f01debf40d90640a3a28346f0a (diff)
downloadDoxygen-1e373422387e8c1131f887efb47cf3da6459e2ac.zip
Doxygen-1e373422387e8c1131f887efb47cf3da6459e2ac.tar.gz
Doxygen-1e373422387e8c1131f887efb47cf3da6459e2ac.tar.bz2
Doxygen didn't allow @ref to parameters of type reference to an array.
-rw-r--r--src/doctokenizer.l3
-rw-r--r--src/util.cpp3
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);