Merge pull request #688 from denizevrenci/raw_string_literals

tmontgomery · web-flow · commit 9ac84e4eb18c · 2019-06-05T13:37:09.000-07:00
[C++] Use raw string literals.
diff --git a/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp/CppGenerator.java b/sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp/CppGenerator.java
@@ -2287,8 +2287,8 @@ private CharSequence generateDisplay(
             indent + "    %1$s writer(_writer.m_buffer, _writer.m_offset,\n" +
             indent + "        _writer.m_bufferLength, _writer.sbeBlockLength(), _writer.m_actingVersion);\n" +
             indent + "    builder << '{';\n" +
-            indent + "    builder << \"\\\"Name\\\": \\\"%1$s\\\", \";\n" +
-            indent + "    builder << \"\\\"sbeTemplateId\\\": \";\n" +
+            indent + "    builder << R\"(\"Name\": \"%1$s\", )\";\n" +
+            indent + "    builder << R\"(\"sbeTemplateId\": )\";\n" +
             indent + "    builder << writer.sbeTemplateId();\n" +
             indent + "    builder << \", \";\n\n" +
             "%2$s" +
@@ -2400,7 +2400,7 @@ private CharSequence appendDisplay(
             sb.append(String.format(
                 indent + "{\n" +
                 indent + "    bool atLeastOne = false;\n" +
-                indent + "    builder << \"\\\"%3$s\\\": [\";\n" +
+                indent + "    builder << R\"(\"%3$s\": [)\";\n" +
                 indent + "    writer.%2$s().forEach([&](%1$s& %2$s)\n" +
                 indent + "    {\n" +
                 indent + "        if (atLeastOne)\n" +
@@ -2437,7 +2437,7 @@ private CharSequence appendDisplay(
 
             final String characterEncoding = varData.get(i + 3).encoding().characterEncoding();
             final String getAsStringFunction = "get" + toUpperFirstChar(varDataToken.name()) + "AsString().c_str()";
-            sb.append(indent + "builder << \"\\\"" + varDataToken.name() + "\\\": \";\n");
+            sb.append(indent + "builder << R\"(\"" + varDataToken.name() + "\": )\";\n");
             if (null == characterEncoding)
             {
                 sb.append(
@@ -2486,7 +2486,7 @@ private CharSequence writeTokenDisplay(
             atLeastOne[0] = true;
         }
 
-        sb.append(indent + "builder << \"\\\"" + fieldTokenName + "\\\": \";\n");
+        sb.append(indent + "builder << R\"(\"" + fieldTokenName + "\": )\";\n");
 
         switch (typeToken.signal())
         {
@@ -2587,7 +2587,7 @@ private CharSequence generateChoicesDisplay(final String name, final List<Token>
                     indent + "        }\n");
             }
             sb.append(
-                indent + "        builder << \"\\\"" + formatPropertyName(token.name()) + "\\\"\";\n");
+                indent + "        builder << R\"(\"" + formatPropertyName(token.name()) + "\")\";\n");
             if (i < (size - 1))
             {
                 sb.append(indent + "        atLeastOne = true;\n");
