diff options
| author | albert-github <albert.tests@gmail.com> | 2019-02-15 14:27:14 (GMT) |
|---|---|---|
| committer | albert-github <albert.tests@gmail.com> | 2019-02-15 14:27:14 (GMT) |
| commit | 1c25efff32ab9b8032b032f5e2374f77b09354eb (patch) | |
| tree | 7066c23246e8882da51b5a4d4a05e0fbfd8eaa89 /src/doctokenizer.l | |
| parent | 9a05fda1c0aef229252d133987f866e0f6718eb0 (diff) | |
| download | Doxygen-1c25efff32ab9b8032b032f5e2374f77b09354eb.zip Doxygen-1c25efff32ab9b8032b032f5e2374f77b09354eb.tar.gz Doxygen-1c25efff32ab9b8032b032f5e2374f77b09354eb.tar.bz2 | |
issue #6831 Failure to recognize class array with PHP in @var
There are 2 different situations here:
- @var, here a special change is necessary to check and handle whether or not we are in PHP (declinfo.*, doxygen.cpp)
- @param
- the type recognition for the PHP type has to be extended with the `[]` possibility and subsequently the `[]` part has to be handled separately from the 'datatype' (doctokinizer.l, docparser.*).
- In the output we now can have multiple text strings resulting in a small change in handling of the separator between the data type (*docvisitor.*)
Diffstat (limited to 'src/doctokenizer.l')
| -rw-r--r-- | src/doctokenizer.l | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/doctokenizer.l b/src/doctokenizer.l index 5cf5f02..3498bc4 100644 --- a/src/doctokenizer.l +++ b/src/doctokenizer.l @@ -1150,7 +1150,7 @@ REFWORD_NOCV {FILEMASK}|{LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV} g_token->name = g_token->name.left((int)yyleng-2); return TK_WORD; } -<St_Param>({PHPTYPE}{BLANK}*"|"{BLANK}*)*{PHPTYPE}{WS}+("&")?"$"{LABELID} { +<St_Param>({PHPTYPE}{BLANK}*("["{BLANK}*"]")*{BLANK}*"|"{BLANK}*)*{PHPTYPE}{BLANK}*("["{BLANK}*"]")*{WS}+("&")?"$"{LABELID} { QCString params = yytext; int j = params.find('&'); int i = params.find('$'); |