rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

char type java generation

This commit is contained in:
rusefi 2020-05-25 13:57:34 -04:00
parent c39d135e94
commit 1053f98985
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
java_tools/ConfigDefinition.jar
View File

Binary file not shown.

23
java_tools/configuration_definition/src/com/rusefi/VariableRegistry.java
View File

@ -41,10 +41,6 @@ public class VariableRegistry {
Matcher m;
while ((m = VAR.matcher(line)).find()) {
String key = m.group(2);
// key =
if (!data.containsKey(key))
throw new IllegalStateException("No such variable: " + key);
String s = data.get(key);
@ -99,20 +95,29 @@ public class VariableRegistry {
} catch (NumberFormatException e) {
SystemOut.println("Not an integer: " + value);
if (isQuoted(value) && !var.trim().endsWith(ConfigField.ENUM_SUFFIX)) {
// quoted and not with enum suffix means plain string define statement
javaDefinitions.put(var, "\tpublic static final String " + var + " = " + value + ";" + EOL);
if (!var.trim().endsWith(ConfigField.ENUM_SUFFIX)) {
if (isQuoted(value, '"')) {
// quoted and not with enum suffix means plain string define statement
javaDefinitions.put(var, "\tpublic static final String " + var + " = " + value + ";" + EOL);
} else if (isQuoted(value, '\'')) {
// quoted and not with enum suffix means plain string define statement
javaDefinitions.put(var, "\tpublic static final char " + var + " = " + value + ";" + EOL);
}
}
}
}
private boolean isQuoted(String value) {
private boolean isQuoted(String value, char quote) {
if (value == null)
return false;
value = value.trim();
if (value.isEmpty())
return false;
return value.charAt(0) == '"' && value.charAt(value.length() - 1) == '"';
return isQ(value, quote);
}
private boolean isQ(String value, char quote) {
return value.charAt(0) == quote && value.charAt(value.length() - 1) == quote;
}
/**