diff --git a/java_tools/enum2string.jar b/java_tools/enum2string.jar index 88d1710bc7..a495430e56 100644 Binary files a/java_tools/enum2string.jar and b/java_tools/enum2string.jar differ diff --git a/java_tools/enum_to_string/src/com/rusefi/EnumToStringTest.java b/java_tools/enum_to_string/src/com/rusefi/EnumToStringTest.java index 53ee14ffc3..e0074362fe 100644 --- a/java_tools/enum_to_string/src/com/rusefi/EnumToStringTest.java +++ b/java_tools/enum_to_string/src/com/rusefi/EnumToStringTest.java @@ -24,6 +24,7 @@ public class EnumToStringTest { assertTrue(isKeyValueLine("MIN")); assertTrue(isKeyValueLine("MIN = 2,")); assertTrue(isKeyValueLine("MIN = -3,")); + assertTrue(isKeyValueLine("Force_4_bytes_size_operation_mode_e = ENUM_32_BITS,")); assertTrue(isKeyValueLine("MIN = 0x02,")); assertTrue(isKeyValueLine("MIN = 0xa2,")); assertTrue(isKeyValueLine("MIN = 0xB2,")); diff --git a/java_tools/enum_to_string/src/com/rusefi/EnumsReader.java b/java_tools/enum_to_string/src/com/rusefi/EnumsReader.java index 400674dc15..52826f2f2a 100644 --- a/java_tools/enum_to_string/src/com/rusefi/EnumsReader.java +++ b/java_tools/enum_to_string/src/com/rusefi/EnumsReader.java @@ -56,6 +56,6 @@ public class EnumsReader { } static boolean isKeyValueLine(String line) { - return removeSpaces(line).matches("[a-zA-Z_$][a-zA-Z\\d_$]*(=(0x[0-9a-fA-F]+|(-)?[0-9]+))*,?"); + return removeSpaces(line).matches("[a-zA-Z_$][a-zA-Z\\d_$]*(=(0x[0-9a-fA-F]+|(-)?[0-9]+|([-a-zA-Z\\d_])*))*,?"); } }