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

remove preproc.substitute_unicode (fixes #5456)

Browse Source
This commit is contained in:
Ben Fry
2018-04-05 10:45:46 -04:00
parent 4cc00afe49
commit f4bfffc5a9
2 changed files with 3 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
java/src/processing/mode/java/preproc/PdePreprocessor.java
View File

@@ -907,15 +907,15 @@ public class PdePreprocessor {
// these ones have the .* at the end, since a class name might be at the end
// instead of .* which would make trouble other classes using this can lop
// off the . and anything after it to produce a package name consistently.
final ArrayList<String> programImports = new ArrayList<String>();
final ArrayList<String> programImports = new ArrayList<>();
// imports just from the code folder, treated differently
// than the others, since the imports are auto-generated.
final ArrayList<String> codeFolderImports = new ArrayList<String>();
final ArrayList<String> codeFolderImports = new ArrayList<>();
// need to reset whether or not this has a main()
// foundMain = false;
foundMethods = new HashSet<String>();
foundMethods = new HashSet<>();
// http://processing.org/bugs/bugzilla/5.html
if (!program.endsWith("\n")) {
@@ -924,12 +924,6 @@ public class PdePreprocessor {
checkForUnterminatedMultilineComment(program);
// Removing all the Unicode characters makes detecting and reporting their
// preprocessor errors quite hard.
// if (Preferences.getBoolean("preproc.substitute_unicode")) {
// program = substituteUnicode(program);
// }
// For 0215, adding } as a legitimate prefix to the import (along with
// newline and semicolon) for cases where a tab ends with } and an import
// statement starts the next tab.
@@ -985,44 +979,6 @@ public class PdePreprocessor {
}
static String substituteUnicode(String program) {
// check for non-ascii chars (these will be/must be in unicode format)
char p[] = program.toCharArray();
int unicodeCount = 0;
for (int i = 0; i < p.length; i++) {
if (p[i] > 127)
unicodeCount++;
}
if (unicodeCount == 0)
return program;
// if non-ascii chars are in there, convert to unicode escapes
// add unicodeCount * 5.. replacing each unicode char
// with six digit uXXXX sequence (xxxx is in hex)
// (except for nbsp chars which will be a replaced with a space)
int index = 0;
char p2[] = new char[p.length + unicodeCount * 5];
for (int i = 0; i < p.length; i++) {
if (p[i] < 128) {
p2[index++] = p[i];
} else if (p[i] == 160) { // unicode for non-breaking space
p2[index++] = ' ';
} else {
int c = p[i];
p2[index++] = '\\';
p2[index++] = 'u';
char str[] = Integer.toHexString(c).toCharArray();
// add leading zeros, so that the length is 4
//for (int i = 0; i < 4 - str.length; i++) p2[index++] = '0';
for (int m = 0; m < 4 - str.length; m++)
p2[index++] = '0';
System.arraycopy(str, 0, p2, index, str.length);
index += str.length;
}
}
return new String(p2, 0, index);
}
/**
* preprocesses a pde file and writes out a java file
* @return the class name of the exported Java