summaryrefslogtreecommitdiffstats
path: root/src/code.l
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2000-06-04 17:46:13 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2000-06-04 17:46:13 (GMT)
commitd8197176c24ca1a41af722063bfb6ceeb050442c (patch)
tree85b63b795f663bb71c26c647948a085a3849177d /src/code.l
parent3e33c5094f5127c719418656fff8e47d2e19405e (diff)
downloadDoxygen-d8197176c24ca1a41af722063bfb6ceeb050442c.zip
Doxygen-d8197176c24ca1a41af722063bfb6ceeb050442c.tar.gz
Doxygen-d8197176c24ca1a41af722063bfb6ceeb050442c.tar.bz2
Release-1.1.4
Diffstat (limited to 'src/code.l')
-rw-r--r--src/code.l8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/code.l b/src/code.l
index 660b361..04cefa8 100644
--- a/src/code.l
+++ b/src/code.l
@@ -1002,10 +1002,10 @@ TYPEKW ("bool"|"char"|"double"|"float"|"int"|"long"|"short"|"signed"|"unsigned"
<SkipCxxComment>. {
g_code->codify(yytext);
}
-<RemoveSpecialCComment>"*/"{B}*\n({B}*\n)*({B}*"//@"[{}]{B}*\n)?{B}*"/*"[*!]/[^/*] {
+<RemoveSpecialCComment>"*/"{B}*\n({B}*\n)*({B}*(("//@"[{}])|("/*@"[{}]"*/")){B}*\n)?{B}*"/*"[*!]/[^/*] {
g_yyLineNr+=QCString(yytext).contains('\n');
}
-<RemoveSpecialCComment>"*/"{B}*\n({B}*\n)*({B}*"//@"[{}]{B}*\n)? {
+<RemoveSpecialCComment>"*/"{B}*\n({B}*\n)*({B}*(("//@"[{}])|("/*@"[{}]"*/")){B}*\n)? {
g_yyLineNr+=QCString(yytext).contains('\n');
g_code->endCodeLine();
if (g_yyLineNr<g_inputLines)
@@ -1046,7 +1046,7 @@ TYPEKW ("bool"|"char"|"double"|"float"|"int"|"long"|"short"|"signed"|"unsigned"
endFontClass();
}
}
-<*>\n({B}*"//@"[{}]{B}*\n) { // remove one-line group marker
+<*>\n({B}*(("//@"[{}])|("/*@"[{}]"*/")){B}*\n) { // remove one-line group marker
if (Config::stripCommentsFlag)
{
g_yyLineNr+=((QCString)yytext).contains('\n');
@@ -1063,7 +1063,7 @@ TYPEKW ("bool"|"char"|"double"|"float"|"int"|"long"|"short"|"signed"|"unsigned"
endFontClass();
}
}
-<*>^{B}*"//@"[{}]{B}*\n { // remove one-line group marker
+<*>^{B}*(("//@"[{}])|("/*@"[{}]"*/")){B}*\n { // remove one-line group marker
if (Config::stripCommentsFlag)
{
g_yyLineNr++;