Merge pull request pboyer#32 from nburles/fix-whitespace-escape

Leave spaces alone unless escaped spaces requested
millergarym · Aug 2, 2016 · 50d1f2c · 50d1f2c
2 parents 183b7ce + db8339b
commit 50d1f2c
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/runtime/Cpp/runtime/src/support/CPPUtils.cpp b/runtime/Cpp/runtime/src/support/CPPUtils.cpp
@@ -57,14 +57,6 @@ namespace antlrcpp {
     std::string result;
     for (auto c : str) {
       switch (c) {
-        case ' ':
-          if (escapeSpaces) {
-            result += "·";
-            break;
-          } else {
-            // fall through
-          }
-
         case '\n':
           result += "\\n";
           break;
@@ -77,6 +69,13 @@ namespace antlrcpp {
           result += "\\t";
           break;
 
+        case ' ':
+          if (escapeSpaces) {
+            result += "·";
+            break;
+          }
+          // else fall through
+
         default:
           result += c;
       }