Merge pull request #1749 from guwirth/fix-1748

fix raw string parsing
SonarOpenCommunity · Aug 18, 2019 · f4f66ce · f4f66ce
2 parents 7016e3e + d1f847b
commit f4f66ce
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/cxx-squid/src/main/java/org/sonar/cxx/channels/StringLiteralsChannel.java b/cxx-squid/src/main/java/org/sonar/cxx/channels/StringLiteralsChannel.java
@@ -99,7 +99,9 @@ private boolean readRawString(CodeReader code) {
       index++;
     }
     String delimiter = sb.toString();
+    sb.setLength(0);
     do {
+      index -= sb.length();
       sb.setLength(0);
       while ((charAt = code.charAt(index)) != ')') { // raw_character*
         if (charAt == EOF) {

diff --git a/cxx-squid/src/test/java/org/sonar/cxx/lexer/CxxLexerTest.java b/cxx-squid/src/test/java/org/sonar/cxx/lexer/CxxLexerTest.java
@@ -565,7 +565,15 @@ public void rawstring_literals() {
           .tokenValue("R\"X*X(A C++11 raw string literal can be specified like this: R\"(This is my raw string)\" )X*X\"")
           .tokenType(CxxTokenType.STRING).build(), // raw string: complex example
         LiteralValuesBuilder.builder("R\"([.^$|()\\[\\]{}*+?\\\\])\"").tokenValue("R\"([.^$|()\\[\\]{}*+?\\\\])\"")
-          .tokenType(CxxTokenType.STRING).build() // raw string: regex sample
+          .tokenType(CxxTokenType.STRING).build(), // raw string: regex sample
+
+       // fix #1748       
+       LiteralValuesBuilder.builder("R\"(([A-Z\\d]))\"").tokenValue("R\"(([A-Z\\d]))\"")
+          .tokenType(CxxTokenType.STRING).build(),
+       LiteralValuesBuilder.builder("R\"regex(([A-Z\\d]))regex\"").tokenValue("R\"regex(([A-Z\\d]))regex\"")
+          .tokenType(CxxTokenType.STRING).build(),
+       LiteralValuesBuilder.builder("R\"(())\"").tokenValue("R\"(())\"")
+          .tokenType(CxxTokenType.STRING).build()
       ));
 
     values.forEach(value