Bug 720580 - inline source browser shows wrong code with muilti-line c++11's raw strings

4eeba431 · Dimitri van Heesch · f5aa5e7b · 4eeba431 · 4eeba431
Commit 4eeba431 authored Dec 24, 2013 by Dimitri van Heesch
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

code.l src/code.l +1 -1

scanner.l src/scanner.l +1 -1

No files found.
--- 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]+			{

--- 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>.                           {