diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2020-09-01 19:10:50 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2020-09-01 19:10:50 (GMT) |
| commit | c4a766d5fbadc7830b7163459d8e28b912f6a398 (patch) | |
| tree | 0111837d446a6fdd92d53849618c1923e41d41c5 | |
| parent | d3d9dd8540ec159de080859c8f34a2581c4147f0 (diff) | |
| parent | ed2fb0d0e6d6fee34a698c48dff925b92e7661c0 (diff) | |
| download | Doxygen-c4a766d5fbadc7830b7163459d8e28b912f6a398.zip Doxygen-c4a766d5fbadc7830b7163459d8e28b912f6a398.tar.gz Doxygen-c4a766d5fbadc7830b7163459d8e28b912f6a398.tar.bz2 | |
Merge branch 'master' of github.com:doxygen/doxygen
| -rw-r--r-- | src/declinfo.l | 1 | ||||
| -rw-r--r-- | src/scanner.l | 15 |
2 files changed, 12 insertions, 4 deletions
diff --git a/src/declinfo.l b/src/declinfo.l index 2f497f9..014ef75 100644 --- a/src/declinfo.l +++ b/src/declinfo.l @@ -149,6 +149,7 @@ ID "$"?([a-z_A-Z\x80-\xFF][a-z_A-Z0-9\x80-\xFF]*)|(@[0-9]+) addType(yyscanner); } <Start>{B}*"("({ID}"::")*{B}*[&*]({B}*("const"|"volatile"){B}+)? { + if (yyextra->insidePHP) REJECT; addType(yyscanner); QCString text=yytext; yyextra->type+=text.stripWhiteSpace(); diff --git a/src/scanner.l b/src/scanner.l index 70f15d6..e56f151 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -6506,10 +6506,17 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) BEGIN( ReadFuncArgType ) ; } <Prototype>"("({ID}"::")*({B}*[&*])+ { - yyextra->current->type+=yyextra->current->name+yytext; - yyextra->current->name.resize(0); - BEGIN( PrototypePtr ); - } + if (yyextra->insidePHP) // reference parameter + { + REJECT; + } + else + { + yyextra->current->type+=yyextra->current->name+yytext; + yyextra->current->name.resize(0); + BEGIN( PrototypePtr ); + } + } <PrototypePtr>{SCOPENAME} { yyextra->current->name+=yytext; } |