summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2014-04-27 16:17:57 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2014-04-27 16:17:57 (GMT)
commitf4f3e381dba1bc5d46feea3c39e8f076e27463d1 (patch)
tree7f85870dbd4e8860c976ba99d324389f0435d2aa /src
parentb944c2af68a47be948f40b37176f9959ffccc0b9 (diff)
downloadDoxygen-f4f3e381dba1bc5d46feea3c39e8f076e27463d1.zip
Doxygen-f4f3e381dba1bc5d46feea3c39e8f076e27463d1.tar.gz
Doxygen-f4f3e381dba1bc5d46feea3c39e8f076e27463d1.tar.bz2
Bug 729017 - function object in member initializer causes documentation loss
Diffstat (limited to 'src')
-rw-r--r--src/scanner.l11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/scanner.l b/src/scanner.l
index a7ac841..323dc65 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -682,7 +682,6 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
%x SkipCurlyBlock
%x SkipRoundBlock
%x Sharp
-%x SkipSharp
%x SkipRound
%x SkipSquare
%x SkipRemainder
@@ -5353,13 +5352,13 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
BEGIN( ClassVar );
}
}
-<AlignAs>"(" { roundCount=1;
+<AlignAs>"(" { roundCount=0;
BEGIN( AlignAsEnd );
}
<AlignAs>\n { lineCount(); }
<AlignAs>.
<AlignAsEnd>"(" { roundCount++; }
-<AlignAsEnd>")" { if (--roundCount<=0)
+<AlignAsEnd>")" { if (--roundCount<0)
{
BEGIN( lastAlignAsContext );
}
@@ -5843,12 +5842,8 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
<Specialization>. {
*specName += *yytext;
}
-<SkipSharp>"<" { ++sharpCount; }
-<SkipSharp>">" { if (--sharpCount<=0)
- BEGIN ( lastSkipSharpContext );
- }
<SkipRound>"(" { ++roundCount; }
-<SkipRound>")" { if (--roundCount<=0)
+<SkipRound>")" { if (--roundCount<0)
BEGIN ( lastSkipRoundContext );
}
<SkipRound>\" {