summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2015-05-03 07:51:19 (GMT)
committerAdrian Negreanu <adrian.m.negreanu@intel.com>2015-05-15 16:06:04 (GMT)
commit528bb8054ca362843630ec261ca6e6990a206081 (patch)
tree1cd9f74dda74f7c3140e7452dd8d3dbc97f02840 /src
parent3eed7a5c5b330736b508c722c9614c774a678ef1 (diff)
downloadDoxygen-528bb8054ca362843630ec261ca6e6990a206081.zip
Doxygen-528bb8054ca362843630ec261ca6e6990a206081.tar.gz
Doxygen-528bb8054ca362843630ec261ca6e6990a206081.tar.bz2
Bug 748208 - Bug #313527 regression - Enum in bitfield is not parsed properly.
Diffstat (limited to 'src')
-rw-r--r--src/scanner.l8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/scanner.l b/src/scanner.l
index 9529c34..b3ae01a 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -5634,7 +5634,13 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
BEGIN( ClassVar );
}
<ClassVar>":" {
- if (current->section==Entry::ENUM_SEC) // enum E:2, see bug 313527,
+ if (current->section==Entry::VARIABLE_SEC) // enum A B:2, see bug 748208
+ {
+ current->bitfields+=":";
+ current->args.resize(0);
+ BEGIN(BitFields);
+ }
+ else if (current->section==Entry::ENUM_SEC) // enum E:2, see bug 313527,
// or C++11 style enum: 'E : unsigned int {...}'
{
current->args.resize(0);