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

Author: Federico Fissore

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

@@ -49,7 +49,7 @@ public class PdePreprocessor {
   // stores number of included library headers written
   // we always write one header: Arduino.h
   public int headerCount = 1;
-  
+
   // the prototypes that are generated by the preprocessor
   List<String> prototypes;
 
@@ -68,11 +68,11 @@ public class PdePreprocessor {
   /**
    * Setup a new preprocessor.
    */
-  public PdePreprocessor() { 
+  public PdePreprocessor() {
   }
 
   /**
-   * Writes out the head of the c++ code generated for a sketch. 
+   * Writes out the head of the c++ code generated for a sketch.
    * Called from processing.app.Sketch.
    * @param program the concatenated code from all tabs containing pde-files
    */
@@ -115,7 +115,7 @@ public int writePrefix(String program)
 
     // store # of prototypes so that line number reporting can be adjusted
     prototypeCount = prototypes.size();
-  
+
     // do this after the program gets re-combobulated
     this.program = program;
 
@@ -164,7 +164,7 @@ static String substituteUnicode(String program) {
   /**
    * preprocesses a pde file and writes out a cpp file into the specified
    * OutputStream
-   * 
+   *
    * @param output
    * @throws Exception
    */
@@ -177,10 +177,10 @@ public void write(OutputStream output) throws Exception {
   // Write the pde program to the cpp file
   protected void writeProgram(PrintStream out, String program, List<String> prototypes) {
     int prototypeInsertionPoint = firstStatement(program);
-  
+
     out.print(program.substring(0, prototypeInsertionPoint));
-    out.print("#include \"Arduino.h\"\n");    
-    
+    out.print("#include \"Arduino.h\"\n");
+
     // print user defined prototypes
     for (int i = 0; i < prototypes.size(); i++) {
       out.print(prototypes.get(i) + "\n");
@@ -214,26 +214,26 @@ public List<String> getExtraImports() {
   public int firstStatement(String in) {
     // whitespace
     String p = "\\s+";
-    
+
     // multi-line and single-line comment
     //p += "|" + "(//\\s*?$)|(/\\*\\s*?\\*/)";
     p += "|(/\\*[^*]*(?:\\*(?!/)[^*]*)*\\*/)|(//.*?$)";
 
     // pre-processor directive
     p += "|(#(?:\\\\\\n|.)*)";
     Pattern pattern = Pattern.compile(p, Pattern.MULTILINE);
-      
+
     Matcher matcher = pattern.matcher(in);
     int i = 0;
     while (matcher.find()) {
       if (matcher.start()!=i)
         break;
       i = matcher.end();
     }
-    
+
     return i;
   }
-  
+
   /**
    * Strips comments, pre-processor directives, single- and double-quoted
    * strings from a string.
@@ -271,7 +271,7 @@ private String collapseBraces(String in) {
     StringBuffer buffer = new StringBuffer();
     int nesting = 0;
     int start = 0;
-    
+
     // XXX: need to keep newlines inside braces so we can determine the line
     // number of a prototype
     for (int i = 0; i < in.length(); i++) {
@@ -288,32 +288,32 @@ private String collapseBraces(String in) {
         }
       }
     }
-    
+
     buffer.append(in.substring(start));
-    
+
     return buffer.toString();
   }
-  
+
   public ArrayList<String> prototypes(String in) {
     in = collapseBraces(strip(in));
 
     // XXX: doesn't handle ... varargs
     // XXX: doesn't handle function pointers
     Pattern prototypePattern = Pattern.compile("[\\w\\[\\]\\*]+\\s+[&\\[\\]\\*\\w\\s]+\\([&,\\[\\]\\*\\w\\s]*\\)(?=\\s*;)");
     Pattern functionPattern  = Pattern.compile("[\\w\\[\\]\\*]+\\s+[&\\[\\]\\*\\w\\s]+\\([&,\\[\\]\\*\\w\\s]*\\)(?=\\s*\\{)");
-    
+
     // Find already declared prototypes
     ArrayList<String> prototypeMatches = new ArrayList<String>();
     Matcher prototypeMatcher = prototypePattern.matcher(in);
     while (prototypeMatcher.find())
       prototypeMatches.add(prototypeMatcher.group(0) + ";");
-    
+
     // Find all functions and generate prototypes for them
     ArrayList<String> functionMatches = new ArrayList<String>();
     Matcher functionMatcher = functionPattern.matcher(in);
     while (functionMatcher.find())
       functionMatches.add(functionMatcher.group(0) + ";");
-    
+
     // Remove generated prototypes that exactly match ones found in the source file
     for (int functionIndex=functionMatches.size() - 1; functionIndex >= 0; functionIndex--) {
       for (int prototypeIndex=0; prototypeIndex < prototypeMatches.size(); prototypeIndex++) {
@@ -323,10 +323,29 @@ public ArrayList<String> prototypes(String in) {
         }
       }
     }
-    
+
     return functionMatches;
   }
 
+  private boolean isStartOrEndOfString(char p[], int index) {
+    if (p[index] != '\"') {
+      return false;
+    }
+
+    if (index == 0) {
+      return true;
+    }
+
+    if (p[index - 1] == '\\') {
+      return false;
+    }
+
+    if (index - 2 >= 0 && p[index - 2] == '\\') {
+      return true;
+    }
+
+    return true;
+  }
 
   /**
    * Replace all commented portions of a given String as spaces.
@@ -338,7 +357,7 @@ public String scrubComments(String what) {
     int index = 0;
     boolean insideString = false;
     while (index < p.length) {
-      if (p[index] == '\"') {
+      if (isStartOrEndOfString(p, index)) {
         insideString = !insideString;
       }
       // for any double slash comments, ignore until the end of the line

app/test/processing/app/preproc/StringWithCcomment.ino

@@ -1,6 +1,10 @@
 void setup() {
   // put your setup code here, to run once:
+  // "comment with a double quote
+  /* \" other comment with double quote */
   Serial.println("Accept: */*");
+  Serial.println("Accept: \" */*");
+  Serial.println("Accept: \\"); // */*");
 }
 
 void loop() {

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

@@ -1,6 +1,10 @@
 void setup() {
 
+   
+   
+  Serial.println( );
   Serial.println( );
+  Serial.println( );  
 }
 
 void loop() {