Merge pull request processing#5019 from JakubValtar/fix-comment-scrub

benfry · web-flow · commit d391bfa70adc · 2017-04-21T17:23:36.000-04:00
Scrub comments: skip the second chracter in the escape sequence
diff --git a/java/src/processing/mode/java/preproc/PdePreprocessor.java b/java/src/processing/mode/java/preproc/PdePreprocessor.java
@@ -730,10 +730,16 @@ static public String scrubComments(String what) {
           throw new RuntimeException("Missing the */ from the end of a " +
                                      "/* comment */");
         }
-      } else if (p[index] == '"' && index > 0 && p[index-1] != '\\') {
+
+        // switch in/out of quoted region
+      } else if (p[index] == '"') {
         insideQuote = !insideQuote;
         index++;
 
+        // skip the escaped char
+      } else if (insideQuote && p[index] == '\\') {
+        index += 2;
+
       } else {  // any old character, move along
         index++;
       }
