From 1053f9898557208d6232c5c10a3eb66314b3b9a1 Mon Sep 17 00:00:00 2001 From: rusefi Date: Mon, 25 May 2020 13:57:34 -0400 Subject: [PATCH] char type java generation --- java_tools/ConfigDefinition.jar | Bin 167514 -> 167734 bytes .../src/com/rusefi/VariableRegistry.java | 23 +++++++++++------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar index 13492c45a40b0d962b354b86aaa44af18756c5fc..c14a88ab385156d94a675d270bbdbaf2bfe0da91 100644 GIT binary patch delta 20319 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�bU&8%UW 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 delta 20085 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 KnhoG@>3;zGg4=`u diff --git a/java_tools/configuration_definition/src/com/rusefi/VariableRegistry.java b/java_tools/configuration_definition/src/com/rusefi/VariableRegistry.java index 2fd7c5f316..739251a759 100644 --- a/java_tools/configuration_definition/src/com/rusefi/VariableRegistry.java +++ b/java_tools/configuration_definition/src/com/rusefi/VariableRegistry.java @@ -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; } /**