summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2013-12-24 12:46:18 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2013-12-24 16:10:05 (GMT)
commit4eeba43132e0b82f2bccf7f24d1e7e3727545e5c (patch)
treec78cda748b4c9d75d9279f271573e05d6dbdc160 /src
parentf5aa5e7b8306f3fe438127396515d36e1482e6ae (diff)
downloadDoxygen-4eeba43132e0b82f2bccf7f24d1e7e3727545e5c.zip
Doxygen-4eeba43132e0b82f2bccf7f24d1e7e3727545e5c.tar.gz
Doxygen-4eeba43132e0b82f2bccf7f24d1e7e3727545e5c.tar.bz2
Bug 720580 - inline source browser shows wrong code with muilti-line c++11's raw strings
Diffstat (limited to 'src')
-rw-r--r--src/code.l2
-rw-r--r--src/scanner.l2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/code.l b/src/code.l
index b0c7104..ba35f7d 100644
--- a/src/code.l
+++ b/src/code.l
@@ -2602,7 +2602,7 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\"
BEGIN( g_lastStringContext );
}
}
-<RawString>[^)]+ { g_code->codify(yytext); }
+<RawString>[^)\n]+ { g_code->codify(yytext); }
<RawString>. { g_code->codify(yytext); }
<RawString>\n { codifyLines(yytext); }
<SkipVerbString>[^"\n]+ {
diff --git a/src/scanner.l b/src/scanner.l
index 50b3e8a..bbe90a3 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -2902,7 +2902,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
BEGIN(lastRawStringContext);
}
}
-<RawGString>[^)]+ {
+<RawGString>[^)\n]+ {
*pCopyRawGString+=yytext;
}
<RawGString>. {