Merge branch 'ide-1.5.x' into ide-1.5.x-jssc

Author: Federico Fissore

app/src/processing/app/preproc/PdePreprocessor.java

@@ -334,49 +334,16 @@ public ArrayList<String> prototypes(String in) {
    * Utility function used here and in the preprocessor.
    */
   static public String scrubComments(String what) {
-    char p[] = what.toCharArray();
-
-    int index = 0;
-    while (index < p.length) {
-      // for any double slash comments, ignore until the end of the line
-      if ((p[index] == '/') &&
-          (index < p.length - 1) &&
-          (p[index+1] == '/')) {
-        p[index++] = ' ';
-        p[index++] = ' ';
-        while ((index < p.length) &&
-               (p[index] != '\n')) {
-          p[index++] = ' ';
-        }
+    List<Pattern> patterns = new ArrayList<Pattern>();
+    patterns.add(Pattern.compile("('\\\\\"')", Pattern.MULTILINE));
+    patterns.add(Pattern.compile("(//.*?$)", Pattern.MULTILINE));
+    patterns.add(Pattern.compile("(/\\*[^*]*(?:\\*(?!/)[^*]*)*\\*/)", Pattern.MULTILINE));
 
-        // check to see if this is the start of a new multiline comment.
-        // if it is, then make sure it's actually terminated somewhere.
-      } else if ((p[index] == '/') &&
-                 (index < p.length - 1) &&
-                 (p[index+1] == '*')) {
-        p[index++] = ' ';
-        p[index++] = ' ';
-        boolean endOfRainbow = false;
-        while (index < p.length - 1) {
-          if ((p[index] == '*') && (p[index+1] == '/')) {
-            p[index++] = ' ';
-            p[index++] = ' ';
-            endOfRainbow = true;
-            break;
-
-          } else {
-            // continue blanking this area
-            p[index++] = ' ';
-          }
-        }
-        if (!endOfRainbow) {
-          throw new RuntimeException(_("Missing the */ from the end of a " +
-                                       "/* comment */"));
-        }
-      } else {  // any old character, move along
-        index++;
-      }
+    String result = what;
+    for (Pattern p : patterns) {
+      result = p.matcher(result).replaceAll("");
     }
-    return new String(p);
+
+    return result;
   }
 }

app/test/processing/app/preproc/PdePreprocessorTest.java

@@ -16,7 +16,7 @@ public void testSourceWithQuoteAndDoubleQuotesEscapedAndFinalQuoteShouldNotRaise
     String actualOutput = new PdePreprocessor().strip(s);
     String expectedOutput = FileUtils.readFileToString(new File(PdePreprocessorTest.class.getResource("RemoteCallLogger_v1e0.stripped.ino").getFile()));
 
-    assertEquals(actualOutput, expectedOutput);
+    assertEquals(expectedOutput, actualOutput);
   }
 
   @Test

app/test/processing/app/preproc/RemoteCallLogger_v1e0.stripped.ino

@@ -1,8 +1,5 @@
 
 
-
- 
-