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

minor progress: generating less unused bit noise in java

This commit is contained in:
rusefillc 2022-12-04 00:09:14 -05:00
parent bd1206c851
commit 032deea464
2 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
java_tools/configuration_definition/src/main/java/com/rusefi/output/GetConfigValueConsumer.java
View File

@ -17,6 +17,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import static com.rusefi.output.ConfigStructure.ALIGNMENT_FILL_AT;
import static com.rusefi.output.DataLogConsumer.UNUSED;
import static com.rusefi.output.GetOutputValueConsumer.getHashConflicts;
import static com.rusefi.output.GetOutputValueConsumer.wrapSwitchStatement;
import static com.rusefi.output.JavaSensorsConsumer.quote;
@SuppressWarnings("StringConcatenationInsideStringBufferAppend")
@ -27,21 +28,19 @@ public class GetConfigValueConsumer implements ConfigurationConsumer {
"#include \"value_lookup.h\"\n";
private static final String FIND_METHOD =
"plain_get_float_s * findFloat(const char *name) {\n" +
"\tplain_get_float_s *currentF = &getF_plain[0];\n" +
"\twhile (currentF < getF_plain + efi::size(getF_plain)) {\n" +
"\t\tif (strEqualCaseInsensitive(name, currentF->token)) {\n" +
"\t\t\treturn currentF;\n" +
"\t\t}\n" +
"\t\tcurrentF++;\n" +
"\t}\n" +
"\treturn nullptr;\n" +
"}\n";
"\tplain_get_float_s *currentF = &getF_plain[0];\n" +
"\twhile (currentF < getF_plain + efi::size(getF_plain)) {\n" +
"\t\tif (strEqualCaseInsensitive(name, currentF->token)) {\n" +
"\t\t\treturn currentF;\n" +
"\t\t}\n" +
"\t\tcurrentF++;\n" +
"\t}\n" +
"\treturn nullptr;\n" +
"}\n";
private static final String GET_METHOD_HEADER =
"float getConfigValueByName(const char *name) {\n" +
"\t{\n"
;
"float getConfigValueByName(const char *name) {\n" +
"\t{\n";
static final String GET_METHOD_FOOTER = "\treturn EFI_ERROR_CODE;\n" + "}\n";
private static final String SET_METHOD_HEADER = "void setConfigValueByName(const char *name, float value) {\n" +
@ -143,7 +142,7 @@ public class GetConfigValueConsumer implements ConfigurationConsumer {
StringBuilder getterBody = GetOutputValueConsumer.getGetters(switchBody, getterPairs);
String fullSwitch = GetOutputValueConsumer.wrapSwitchStatement(switchBody);
String fullSwitch = wrapSwitchStatement(switchBody);
return GET_METHOD_HEADER +
fullSwitch +
@ -156,21 +155,29 @@ public class GetConfigValueConsumer implements ConfigurationConsumer {
}
public String getSetterBody() {
StringBuilder switchBody = new StringBuilder();
StringBuilder setterBody = new StringBuilder();
HashMap<Integer, AtomicInteger> hashConflicts = getHashConflicts(setterPairs);
for (Pair<String, String> pair : setterPairs) {
// int hash = HashUtil.hash(pair.first);
// if (hashConflicts.get(hash).get() == 1) {
setterBody.append(getCompareName(pair.first));
int hash = HashUtil.hash(pair.first);
String str = getAssignment("(int)", pair.second);
setterBody.append(str);
if (hashConflicts.get(hash).get() == 1) {
switchBody.append("\t\tcase " + hash + ":\n");
switchBody.append(str);
} else {
setterBody.append(getCompareName(pair.first));
setterBody.append(str);
}
}
String fullSwitch = wrapSwitchStatement(switchBody);
return setterBody.toString();
return fullSwitch + setterBody;
}
public String getContent() {

5
java_tools/configuration_definition/src/test/java/com/rusefi/test/GetConfigValueConsumerTest.java
View File

@ -52,10 +52,13 @@ public class GetConfigValueConsumerTest {
GetConfigValueConsumer getConfigValueConsumer = new GetConfigValueConsumer(null);
state.readBufferedReader(test, getConfigValueConsumer);
assertEquals("\tif (strEqualCaseInsensitive(name, \"iat.adcChannel\"))\n" +
assertEquals("\tint hash = djb2lowerCase(name);\n" +
"\tswitch(hash) {\n" +
"\t\tcase -1237776078:\n" +
"\t{\n" +
"\t\tconfig->iat.adcChannel = (int)value;\n" +
"\t\treturn;\n" +
"\t}\n" +
"\t}\n", getConfigValueConsumer.getSetterBody());
assertEquals(