summaryrefslogtreecommitdiffstats
path: root/src/code.l
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2019-08-07 09:01:57 (GMT)
committerGitHub <noreply@github.com>2019-08-07 09:01:57 (GMT)
commitb51aa6497c579fcfce0fb3b261e7ca9418e48fe7 (patch)
tree03c50d1f0606e265ac334fcdb65379359b13eec6 /src/code.l
parent5301dfe4b9a550cd8d956b74ce4a2a65183d2170 (diff)
parent97c4c1178de1a2798e78790617cf4e1835c577db (diff)
downloadDoxygen-b51aa6497c579fcfce0fb3b261e7ca9418e48fe7.zip
Doxygen-b51aa6497c579fcfce0fb3b261e7ca9418e48fe7.tar.gz
Doxygen-b51aa6497c579fcfce0fb3b261e7ca9418e48fe7.tar.bz2
Merge pull request #7124 from albert-github/feature/issue_7123
issue #7123: some code line are missed in the xml file for java
Diffstat (limited to 'src/code.l')
-rw-r--r--src/code.l26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/code.l b/src/code.l
index b932a43..d66ccc8 100644
--- a/src/code.l
+++ b/src/code.l
@@ -3469,14 +3469,14 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\"
<*>\n{B}*"/*@"[{}] { // remove one-line group marker
if (Config_getBool(STRIP_CODE_COMMENTS))
{
- g_lastSpecialCContext = YY_START;
+ if (YY_START != RemoveSpecialCComment) g_lastSpecialCContext = YY_START;
g_yyLineNr++;
BEGIN(RemoveSpecialCComment);
}
else
{
// check is to prevent getting stuck in skipping C++ comments
- if (YY_START != SkipCxxComment)
+ if (YY_START != SkipComment && YY_START != SkipCxxComment)
{
g_lastCContext = YY_START ;
}
@@ -3501,13 +3501,13 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\"
<*>^{B}*"/*@"[{}] { // remove multi-line group marker
if (Config_getBool(STRIP_CODE_COMMENTS))
{
- g_lastSpecialCContext = YY_START;
+ if (YY_START != RemoveSpecialCComment) g_lastSpecialCContext = YY_START;
BEGIN(RemoveSpecialCComment);
}
else
{
// check is to prevent getting stuck in skipping C++ comments
- if (YY_START != SkipCxxComment)
+ if (YY_START != SkipComment && YY_START != SkipCxxComment)
{
g_lastCContext = YY_START ;
}
@@ -3552,14 +3552,14 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\"
<*>\n{B}*"/*"[!*]/[^/*] {
if (Config_getBool(STRIP_CODE_COMMENTS))
{
- g_lastSpecialCContext = YY_START;
+ if (YY_START != RemoveSpecialCComment) g_lastSpecialCContext = YY_START;
g_yyLineNr++;
BEGIN(RemoveSpecialCComment);
}
else
{
// check is to prevent getting stuck in skipping C++ comments
- if (YY_START != SkipCxxComment)
+ if (YY_START != SkipComment && YY_START != SkipCxxComment)
{
g_lastCContext = YY_START ;
}
@@ -3571,13 +3571,13 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\"
<*>^{B}*"/**"[*]+/[^/] { // special C "banner" comment block at a new line
if (Config_getBool(JAVADOC_BANNER) && Config_getBool(STRIP_CODE_COMMENTS))
{
- g_lastSpecialCContext = YY_START;
+ if (YY_START != RemoveSpecialCComment) g_lastSpecialCContext = YY_START;
BEGIN(RemoveSpecialCComment);
}
else
{
// check is to prevent getting stuck in skipping C++ comments
- if (YY_START != SkipCxxComment)
+ if (YY_START != SkipComment && YY_START != SkipCxxComment)
{
g_lastCContext = YY_START ;
}
@@ -3589,13 +3589,13 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\"
<*>^{B}*"/*"[!*]/[^/*] { // special C comment block at a new line
if (Config_getBool(STRIP_CODE_COMMENTS))
{
- g_lastSpecialCContext = YY_START;
+ if (YY_START != RemoveSpecialCComment) g_lastSpecialCContext = YY_START;
BEGIN(RemoveSpecialCComment);
}
else
{
// check is to prevent getting stuck in skipping C++ comments
- if (YY_START != SkipCxxComment)
+ if (YY_START != SkipComment && YY_START != SkipCxxComment)
{
g_lastCContext = YY_START ;
}
@@ -3608,13 +3608,13 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\"
if (YY_START==SkipString) REJECT;
if (Config_getBool(STRIP_CODE_COMMENTS))
{
- g_lastSpecialCContext = YY_START;
+ if (YY_START != RemoveSpecialCComment) g_lastSpecialCContext = YY_START;
BEGIN(RemoveSpecialCComment);
}
else
{
// check is to prevent getting stuck in skipping C++ comments
- if (YY_START != SkipCxxComment)
+ if (YY_START != SkipComment && YY_START != SkipCxxComment)
{
g_lastCContext = YY_START ;
}
@@ -3639,7 +3639,7 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\"
startFontClass("comment");
g_code->codify(yytext);
// check is to prevent getting stuck in skipping C++ comments
- if (YY_START != SkipCxxComment)
+ if (YY_START != SkipComment && YY_START != SkipCxxComment)
{
g_lastCContext = YY_START ;
}