summaryrefslogtreecommitdiffstats
path: root/src/code.l
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2010-02-08 20:59:33 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2010-02-08 20:59:33 (GMT)
commitf22ba481afa686d1a834e056963f8d41621aba88 (patch)
tree267387c59c5c0c6c4623d616f7102d54600dfba9 /src/code.l
parent3eb607c72338237e65fc44562b153db7ce4e0ac9 (diff)
downloadDoxygen-f22ba481afa686d1a834e056963f8d41621aba88.zip
Doxygen-f22ba481afa686d1a834e056963f8d41621aba88.tar.gz
Doxygen-f22ba481afa686d1a834e056963f8d41621aba88.tar.bz2
Release-1.6.2-20100208
Diffstat (limited to 'src/code.l')
-rw-r--r--src/code.l6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/code.l b/src/code.l
index 877c2e7..2ad58de 100644
--- a/src/code.l
+++ b/src/code.l
@@ -1938,6 +1938,9 @@ OPERATOR {ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}
<SkipCPP>. {
g_code->codify(yytext);
}
+<SkipCPP>[^\n\/\\]+ {
+ g_code->codify(yytext);
+ }
<SkipCPP>\\[\r]?\n {
codifyLines(yytext);
}
@@ -3043,6 +3046,7 @@ OPERATOR {ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}
BEGIN(g_memCallContext);
}
<*>\n({B}*"//"[!/][^\n]*\n)+ { // remove special one-line comment
+ if (YY_START==SkipCPP) REJECT;
if (Config_getBool("STRIP_CODE_COMMENTS"))
{
g_yyLineNr+=((QCString)yytext).contains('\n');
@@ -3147,7 +3151,7 @@ OPERATOR {ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}
}
}
<*>"//"[!/][^\n]*\n { // strip special one-line comment
- if (YY_START==SkipComment || YY_START==SkipString) REJECT;
+ if (YY_START==SkipComment || YY_START==SkipString || YY_START==SkipCPP) REJECT;
if (Config_getBool("STRIP_CODE_COMMENTS"))
{
char c[2]; c[0]='\n'; c[1]=0;