eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-01-27 18:31:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

As part of #371, finally disable SourceUtils transforms.

Browse Source 
SourceUtils has been doing unnecessary stuff but, until multiline strings, they weren't getting in the way so it stuck around. Adding flag to disable since the automaton inside SourceUtils is difficult to modify for the new language feature.
This commit is contained in:
A Pottinger
2022-01-29 20:05:34 -08:00
parent b66c5f2487
commit 8ee119f150
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/src/processing/mode/java/PreprocService.java
View File

@@ -403,8 +403,8 @@ public class PreprocService {
}
// TODO: convert unicode escapes to chars
SourceUtil.scrubCommentsAndStrings(workBuffer);
// TODO: This appears no longer to be needed.
// SourceUtil.scrubCommentsAndStrings(workBuffer);
result.scrubbedPdeCode = workBuffer.toString();

13
java/src/processing/mode/java/SourceUtil.java
View File

@@ -17,6 +17,9 @@ import processing.mode.java.TextTransform.Edit;
public class SourceUtil {
// No longer needed with use of ANTLR in the preprocessor service.
private static final boolean PERFORM_SOURCE_UTIL_TRANSFORMS = false;
public static final Pattern IMPORT_REGEX =
Pattern.compile("(?:^|;)\\s*(import\\s+(?:(static)\\s+)?((?:\\w+\\s*\\.)*)\\s*(\\S+)\\s*;)",
Pattern.MULTILINE | Pattern.DOTALL);
@@ -162,6 +165,10 @@ public class SourceUtil {
Modifier.PUBLIC | Modifier.PRIVATE | Modifier.PROTECTED;
public static List<Edit> preprocessAST(CompilationUnit cu) {
if (!PERFORM_SOURCE_UTIL_TRANSFORMS) {
return new ArrayList<>();
}
final List<Edit> edits = new ArrayList<>();
// Walk the tree
@@ -251,6 +258,9 @@ public class SourceUtil {
static public void scrubCommentsAndStrings(StringBuilder p) {
if (!PERFORM_SOURCE_UTIL_TRANSFORMS) {
return;
}
final int length = p.length();
@@ -320,7 +330,7 @@ public class SourceUtil {
} else {
// Exiting block
int blockEnd = i;
if (prevState == IN_BLOCK_COMMENT && i < length) blockEnd--; // preserve star in '*/'
if (prevState == IN_BLOCK_COMMENT && i < length) blockEnd--;
for (int j = blockStart; j < blockEnd; j++) {
char c = p.charAt(j);
if (c != '\n' && c != '\r') p.setCharAt(j, ' ');
@@ -330,7 +340,6 @@ public class SourceUtil {
prevState = state;
}
}