eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-04 06:09:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

more cleanups and notes

Browse Source
This commit is contained in:
Ben Fry
2015-10-21 06:36:57 -04:00
parent 6c6f295094
commit d35035d371
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
java/src/processing/mode/java/tweak/SketchParser.java
View File

@@ -60,14 +60,14 @@ public class SketchParser {
// add 'settings' and 'setup' to ignore list (to ignore all numbers there)
ignoreFunctions = new ArrayList<>();
ignoreFunctions.add(Arrays.asList(new Range(getVoidFunctionStart(codeTabs[0], "settings"),
getVoidFunctionEnd(codeTabs[0], "settings")),
new Range(getVoidFunctionStart(codeTabs[0], "setup"),
getVoidFunctionEnd(codeTabs[0], "setup"))));
Range settingsRange = getVoidFunctionRange(codeTabs[0], "settings");
Range setupRange = getVoidFunctionRange(codeTabs[0], "setup");
ignoreFunctions.add(Arrays.asList(settingsRange, setupRange));
//Add empty lists for the other tabs so we do not get an index out of bounds error later
for(int i = 0; i < codeTabs.length-1; i++)
ignoreFunctions.add(Collections.EMPTY_LIST);
for (int i = 0; i < codeTabs.length-1; i++) {
ignoreFunctions.add(new ArrayList<SketchParser.Range>());
}
// build curly scope for every character in the code
curlyScopes = new ArrayList<>();
@@ -839,6 +839,11 @@ public class SketchParser {
return obj;
}
static public Range getVoidFunctionRange(String code, String functionName) {
return new Range(getVoidFunctionStart(code, functionName),
getVoidFunctionEnd(code, functionName));
}
static public int getVoidFunctionStart(String code, String functionName) {
Pattern p = Pattern.compile("void[\\s\\t\\r\\n]*"+functionName+"[\\s\\t]*\\(\\)[\\s\\t\\r\\n]*\\{");
Matcher m = p.matcher(code);