From 4e27fc85ab6c009935c1f3388a11c318926b825f Mon Sep 17 00:00:00 2001 From: Andrey Date: Fri, 2 Sep 2022 23:07:09 -0400 Subject: [PATCH] Revert "looks like dead logic" This reverts commit 607cdbb1324b2c2c41e9d88f98bb5a1e2afd7922. --- .../java/com/rusefi/newparse/ParseState.java | 2 ++ java_tools/enum2string.jar | Bin 93061 -> 92386 bytes .../src/main/java/com/rusefi/ToJavaEnum.java | 8 +++++++- .../java/com/rusefi/VariableRegistry.java | 2 ++ .../java/com/rusefi/enum_reader/Value.java | 7 +++++++ 5 files changed, 18 insertions(+), 1 deletion(-) diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/ParseState.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/ParseState.java index fa1b2526bd..434a7f2566 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/ParseState.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/ParseState.java @@ -82,6 +82,8 @@ public class ParseState { if (stringValueMap == null) return null; for (Value value : stringValueMap.values()) { + if (value.isForceSize()) + continue; if (isNumeric(value.getValue())) { valueNameById.put(value.getIntValue(), value.getName()); diff --git a/java_tools/enum2string.jar b/java_tools/enum2string.jar index cd46ed1c7a71ac77f23f7b3588a876f66090bc02..6a1b9cb2cc01600a9f0bc372ee0043d8e5aa332c 100644 GIT binary patch delta 17188 zcmZX51yCGK*ENd;cX!v|7Th7YySuyV;sk;OUEG61Ah^3jaCZx?!SyG}YtQ#j)z;oU z=W0*isqLAb(0Qn>Nhl;m83;%?FfbSxFpTzG)i@*&B!qOPYFr5k^>rNg+Q`Y7f9$|DaL#-<)JKMqwozt zUPB{(LXo2olY0Ua9B#a|g2#|%Pa8Tuu3@tIR;R!#2=sdd7((ApeI&OrB8$e!z)(&x zW$XKC{jPBHdz1NQSZF%PeooJcPN z^@vzaN@p*o^KS0Ii(^#xfkzGMNbrdJ;bvn7{hZ|d%d{za=P@n_dddUruQzwP$W+}R zBA}e~#f%7zDBR*_;hfssP8nSO^2m|W*yz&gXRNJNt;kw+Va;*})@eQ)i!zooshf@l z&!E$n<6hGJ`^d90<$X19V=f;Nx>pTsti#M8I4Ko~z9@Z!By%Zlcs6i5cwMUVRx>&O z?^;(WB`@y|Mrrhl#hMFZ6esIGZQz^53;# zojRHh_QRMntYG52OzTY#Ld?a^aazTJ`!USG_SX0^v`GT%365>yP*)4#^Xw9S$lB0} zafrX#lOT0j54um$hN%>M3W;0qSvth@`ykiE=IR{^$=?ZOf!uu`voJlx-|G?QSO|2V z{E2W%cE8AOHfTN}al^sUN;=p8d5*MqL1aODIAb`Wz!b%0XjwG?Y20rD=Y$ZyK8T3Y z2fg??>`5_m2_dtQ>cm%gi~fC}LSbYoh1}2JR9#W&dFuHuVYHkYr$pO6Xd5cEKmJ-1h4ow=kPc$`4k zE!rSa(?t;q6lxq3V*>n)yEsGU4?-C>2TQtNC^eAZB^2m1*q;#jor!;E&}#^@J^4-{ zXG`E9*HAY$SGU~kelq8FGG}koayn_h+FSs*d9AE8lj01UBEDNYb87#Ux%Zk;rl9A4 zpAY6PH5#7pson!TyH^afXj_QcW9K^)#muVchrj#Cq2DVro6=qDtvkcKEy|&PV}#XV z5G~j#$xjj$psTBD&0C=@wbNKA$ z_LR;3RP*k2tBZ^8u8{0GIShEcu`F=hOFi?nKC`{fe}|0xqJr45-Q~f5$K-a?kyO0? zYXdk_@mjX|C{VlkI`hNEde;rvKS#bbmk2bo{e9{sQc_6elV?Ftt#Zkgw-mYt$3ubi zNh5!rSMN3ul?gc__PcZ)RdeTZ+-UT*MRYmsL`%FB+iDgwD=r&(v21|^RM)Ad^?N)n z>d~5QbDs1FXSW&Y7>Sl&XZ%5FF>B=fC#!bP&!V@)hx^AoROcSqoK#Vk-6Tdp°6 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 Kns28N?Ee8HLcXp5 delta 17740 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 diff --git a/java_tools/enum_to_string/src/main/java/com/rusefi/ToJavaEnum.java b/java_tools/enum_to_string/src/main/java/com/rusefi/ToJavaEnum.java index 56c7a6912f..36afc8e7e7 100644 --- a/java_tools/enum_to_string/src/main/java/com/rusefi/ToJavaEnum.java +++ b/java_tools/enum_to_string/src/main/java/com/rusefi/ToJavaEnum.java @@ -12,6 +12,10 @@ import java.util.List; import java.util.Map; public class ToJavaEnum { + + public static final String FORCE_2_BYTES_SIZE = "Force_2_bytes_size"; + public static final String FORCE_4_BYTES_SIZE = "Force_4_bytes_size"; + public static void main(String[] args) throws IOException { InvokeReader invokeReader = new InvokeReader(args).invoke(); String outputPath = invokeReader.getOutputPath(); @@ -49,7 +53,9 @@ public class ToJavaEnum { int index = 0; for (Value value : sorted) { int numericValue = value.getIntValueMaybeResolve(registry); - if (index != numericValue) + if (index != numericValue + && !value.getName().startsWith(FORCE_2_BYTES_SIZE) + && !value.getName().startsWith(FORCE_4_BYTES_SIZE)) throw new IllegalStateException("Got explicit ordinal " + numericValue + " instead of ordinal " + index + " in " + value); sb.append("\t" + value.getName() + ",\n"); index++; diff --git a/java_tools/enum_to_string/src/main/java/com/rusefi/VariableRegistry.java b/java_tools/enum_to_string/src/main/java/com/rusefi/VariableRegistry.java index 30572f4bdc..9a0457ae4a 100644 --- a/java_tools/enum_to_string/src/main/java/com/rusefi/VariableRegistry.java +++ b/java_tools/enum_to_string/src/main/java/com/rusefi/VariableRegistry.java @@ -95,6 +95,8 @@ public class VariableRegistry { TreeMap valueNameById = new TreeMap<>(); for (Value value : stringValueMap.values()) { + if (value.isForceSize()) + continue; if (isNumeric(value.getValue())) { valueNameById.put(value.getIntValue(), value.getName()); diff --git a/java_tools/enum_to_string/src/main/java/com/rusefi/enum_reader/Value.java b/java_tools/enum_to_string/src/main/java/com/rusefi/enum_reader/Value.java index 1b749b0e52..e287ce3fae 100644 --- a/java_tools/enum_to_string/src/main/java/com/rusefi/enum_reader/Value.java +++ b/java_tools/enum_to_string/src/main/java/com/rusefi/enum_reader/Value.java @@ -4,6 +4,9 @@ import com.rusefi.VariableRegistry; import java.util.Objects; +import static com.rusefi.ToJavaEnum.FORCE_2_BYTES_SIZE; +import static com.rusefi.ToJavaEnum.FORCE_4_BYTES_SIZE; + public class Value implements Comparable { private final String name; private final String value; @@ -13,6 +16,10 @@ public class Value implements Comparable { this.value = value; } + public boolean isForceSize() { + return getName().startsWith(FORCE_2_BYTES_SIZE) || getName().startsWith(FORCE_4_BYTES_SIZE); + } + public String getName() { return name; }