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

simple code refactor on PdePreprocessor

Browse Source
This commit is contained in:
ricardo.jl.rufino
2015-04-22 13:50:10 -03:00
committed by Federico Fissore
parent 903622ea63
commit c3e1a9443c
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
arduino-core/src/processing/app/preproc/PdePreprocessor.java
View File

@ -42,6 +42,9 @@ import java.util.regex.*;
* Class that orchestrates preprocessing p5 syntax into straight Java. * Class that orchestrates preprocessing p5 syntax into straight Java.
*/ */
public class PdePreprocessor { public class PdePreprocessor {
private static final String IMPORT_REGEX = "^\\s*#include\\s*[<\"](\\S+)[\">]";
// stores number of built user-defined function prototypes // stores number of built user-defined function prototypes
public int prototypeCount = 0; public int prototypeCount = 0;
@ -94,10 +97,9 @@ public class PdePreprocessor {
} }
//String importRegexp = "(?:^|\\s|;)(import\\s+)(\\S+)(\\s*;)"; //String importRegexp = "(?:^|\\s|;)(import\\s+)(\\S+)(\\s*;)";
String importRegexp = "^\\s*#include\\s*[<\"](\\S+)[\">]";
programImports = new ArrayList<String>(); programImports = new ArrayList<String>();
String[][] pieces = PApplet.matchAll(program, importRegexp); String[][] pieces = PApplet.matchAll(program, IMPORT_REGEX);
if (pieces != null) if (pieces != null)
for (int i = 0; i < pieces.length; i++) for (int i = 0; i < pieces.length; i++)
@ -121,6 +123,19 @@ public class PdePreprocessor {
return headerCount + prototypeCount; return headerCount + prototypeCount;
} }
public static List<String> findIncludes(String code){
String[][] pieces = PApplet.matchAll(code, IMPORT_REGEX);
ArrayList programImports = new ArrayList<String>();
if (pieces != null)
for (int i = 0; i < pieces.length; i++)
programImports.add(pieces[i][1]); // the package name
return programImports;
}
static String substituteUnicode(String program) { static String substituteUnicode(String program) {
// check for non-ascii chars (these will be/must be in unicode format) // check for non-ascii chars (these will be/must be in unicode format)