arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-22 08:22:04 +03:00
Code Activity

Fixed pre processor bug. Closes #1245

Browse Source
This commit is contained in:
Federico Fissore
2013-10-22 17:32:25 +02:00
parent dace68fd29
commit bdf7eba7ed
4 changed files with 704 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,13 +112,13 @@ public class PdePreprocessor {
// }
prototypes = prototypes(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;
return headerCount + prototypeCount;
}
@ -244,7 +244,9 @@ public class PdePreprocessor {
// XXX: doesn't properly handle special single-quoted characters
// single-quoted character
String p = "('.')";
p += "|('\\\\\"')";
// double-quoted string
p += "|(\"(?:[^\"\\\\]|\\\\.)*\")";
@ -294,7 +296,7 @@ public class PdePreprocessor {
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*;)");