arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-16 11:21:18 +03:00
Code Activity

PdePreprocessor.scubComments result used before looking for libraries. Fixes #1293

Browse Source
This commit is contained in:
Federico Fissore
2013-11-11 12:05:59 +01:00
parent 22dfa98202
commit 07f8c691b4
3 changed files with 38 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/processing/app/preproc/PdePreprocessor.java
View File

@ -87,7 +87,7 @@ public class PdePreprocessor {
// an OutOfMemoryError or NullPointerException will happen. // an OutOfMemoryError or NullPointerException will happen.
// again, not gonna bother tracking this down, but here's a hack. // again, not gonna bother tracking this down, but here's a hack.
// http://dev.processing.org/bugs/show_bug.cgi?id=16 // http://dev.processing.org/bugs/show_bug.cgi?id=16
scrubComments(program); program = scrubComments(program);
// If there are errors, an exception is thrown and this fxn exits. // If there are errors, an exception is thrown and this fxn exits.
if (Preferences.getBoolean("preproc.substitute_unicode")) { if (Preferences.getBoolean("preproc.substitute_unicode")) {
@ -242,14 +242,17 @@ public class PdePreprocessor {
*/ */
public String strip(String in) { public String strip(String in) {
// XXX: doesn't properly handle special single-quoted characters // XXX: doesn't properly handle special single-quoted characters
List<Pattern> patterns = new ArrayList<Pattern>();
// single-quoted character // single-quoted character
Pattern[] patterns = new Pattern[6]; patterns.add(Pattern.compile("('.')", Pattern.MULTILINE));
patterns[5] = Pattern.compile("(\"(?:[^\"\\\\]|\\\\.)*\")", Pattern.MULTILINE); // single and multi-line comment
patterns[4] = Pattern.compile("(^\\s*#.*?$)", Pattern.MULTILINE); patterns.add(Pattern.compile("('\\\\\"')", Pattern.MULTILINE));
patterns[3] = Pattern.compile("(/\\*[^*]*(?:\\*(?!/)[^*]*)*\\*/)", Pattern.MULTILINE); patterns.add(Pattern.compile("(//.*?$)", Pattern.MULTILINE));
patterns[2] = Pattern.compile("(//.*?$)", Pattern.MULTILINE); patterns.add(Pattern.compile("(/\\*[^*]*(?:\\*(?!/)[^*]*)*\\*/)", Pattern.MULTILINE));
patterns[1] = Pattern.compile("('\\\\\"')", Pattern.MULTILINE); // pre-processor directive
patterns[0] = Pattern.compile("('.')", Pattern.MULTILINE); patterns.add(Pattern.compile("(^\\s*#.*?$)", Pattern.MULTILINE));
// double-quoted string
patterns.add(Pattern.compile("(\"(?:[^\"\\\\]|\\\\.)*\")", Pattern.MULTILINE));
String code = in; String code = in;
for (Pattern p : patterns) { for (Pattern p : patterns) {
@ -259,7 +262,7 @@ public class PdePreprocessor {
return code; return code;
} }
/** /**
* Removes the contents of all top-level curly brace pairs {}. * Removes the contents of all top-level curly brace pairs {}.
* @param in the String to collapse * @param in the String to collapse

15
app/test/processing/app/preproc/IncludeBetweenMultilineComment.ino Normal file
View File

@ -0,0 +1,15 @@
#include <CapacitiveSensorDue.h>
/*
#include <WiFi.h>
*/
CapacitiveSensorDue cs_13_8 = CapacitiveSensorDue(13,8);
void setup()
{
Serial.begin(9600);
}
void loop()
{
long total1 = cs_13_8.read(30);
Serial.println(total1);
delay(100);
}

12
app/test/processing/app/preproc/PdePreprocessorTest.java
View File

@ -18,4 +18,14 @@ public class PdePreprocessorTest {
assertEquals(actualOutput, expectedOutput); assertEquals(actualOutput, expectedOutput);
} }
}
@Test
public void testIncludeInsideMultilineComment() throws Exception {
String s = FileUtils.readFileToString(new File(PdePreprocessorTest.class.getResource("IncludeBetweenMultilineComment.ino").getFile()));
PdePreprocessor pdePreprocessor = new PdePreprocessor();
pdePreprocessor.writePrefix(s);
assertEquals(1, pdePreprocessor.getExtraImports().size());
assertEquals("CapacitiveSensorDue.h", pdePreprocessor.getExtraImports().get(0));
}
}