eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-01-30 11:51:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

ECS: Scrub string literals too

Browse Source
This commit is contained in:
Jakub Valtar
2016-03-25 23:56:02 +01:00
parent 3ff7370841
commit eea5e29202
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/src/processing/mode/java/pdex/ErrorCheckerService.java
View File

@@ -386,7 +386,7 @@ public class ErrorCheckerService {
SourceUtils.substituteUnicode(rawCode);
try {
SourceUtils.scrubComments(rawCode);
SourceUtils.scrubCommentsAndStrings(rawCode);
} catch (RuntimeException e) {
// TODO: Unterminated block comment: add to errors
// Continue normally, comments were scrubbed

29
java/src/processing/mode/java/pdex/SourceUtils.java
View File

@@ -229,9 +229,9 @@ public class SourceUtils {
}
static public String scrubComments(String p) {
static public String scrubCommentsAndStrings(String p) {
StringBuilder sb = new StringBuilder(p);
scrubComments(sb);
scrubCommentsAndStrings(sb);
return sb.toString();
}
@@ -239,7 +239,7 @@ public class SourceUtils {
* Replace all commented portions of a given String as spaces.
* Utility function used here and in the preprocessor.
*/
static public void scrubComments(StringBuilder p) {
static public void scrubCommentsAndStrings(StringBuilder p) {
// Track quotes to avoid problems with code like: String t = "*/*";
// http://code.google.com/p/processing/issues/detail?id=1435
boolean insideQuote = false;
@@ -285,12 +285,23 @@ public class SourceUtils {
throw new RuntimeException("Missing the */ from the end of a " +
"/* comment */");
}
} else if (p.charAt(index) == '"' && index > 0 && p.charAt(index-1) != '\\') {
insideQuote = !insideQuote;
index++;
} else { // any old character, move along
index++;
} else {
boolean isChar = index > 0 && p.charAt(index-1) == '\\';
if ((insideQuote && p.charAt(index) == '\n') ||
(p.charAt(index) == '"' && !isChar)) {
insideQuote = !insideQuote;
index++;
} else if (insideQuote && index < p.length() - 1 &&
p.charAt(index) == '\\' && p.charAt(index+1) == '"') {
p.setCharAt(index, ' ');
p.setCharAt(index + 1, ' ');
index++;
} else if (insideQuote) {
p.setCharAt(index, ' ');
index++;
} else { // any old character, move along
index++;
}
}
}
}