summaryrefslogtreecommitdiffstats
path: root/src/docbookvisitor.cpp
diff options
context:
space:
mode:
authoralbert-github <albert.tests@gmail.com>2019-02-15 14:27:14 (GMT)
committeralbert-github <albert.tests@gmail.com>2019-02-15 14:27:14 (GMT)
commit1c25efff32ab9b8032b032f5e2374f77b09354eb (patch)
tree7066c23246e8882da51b5a4d4a05e0fbfd8eaa89 /src/docbookvisitor.cpp
parent9a05fda1c0aef229252d133987f866e0f6718eb0 (diff)
downloadDoxygen-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/docbookvisitor.cpp')
-rw-r--r--src/docbookvisitor.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/docbookvisitor.cpp b/src/docbookvisitor.cpp
index c36bb00..ca31e07 100644
--- a/src/docbookvisitor.cpp
+++ b/src/docbookvisitor.cpp
@@ -1413,11 +1413,9 @@ DB_VIS_C
{
QListIterator<DocNode> li(pl->paramTypes());
DocNode *type;
- bool first=TRUE;
m_t << " <entry>";
for (li.toFirst();(type=li.current());++li)
{
- if (!first) m_t << " | "; else first=FALSE;
if (type->kind()==DocNode::Kind_Word)
{
visit((DocWord*)type);
@@ -1426,6 +1424,11 @@ DB_VIS_C
{
visit((DocLinkedWord*)type);
}
+ else if (type->kind()==DocNode::Kind_Sep)
+ {
+ m_t << " " << ((DocSeparator *)type)->chars() << " ";
+ }
+
}
m_t << " </entry>";
}