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

refacotring

This commit is contained in:
rusefi 2018-12-20 00:29:09 -05:00
parent cfc05de986
commit 1373125a2a
2 changed files with 7 additions and 4 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.

11
java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java
View File

@ -57,7 +57,7 @@ public class ConfigDefinition {
ConfigurationConsumer cHeaderConsumer = new CHeaderConsumer(cHeader); ConfigurationConsumer cHeaderConsumer = new CHeaderConsumer(cHeader);
ConfigurationConsumer tsProjectConsumer = new TSProjectConsumer(tsWriter, tsPath, state); ConfigurationConsumer tsProjectConsumer = new TSProjectConsumer(tsWriter, tsPath, state);
processFile(state, br, cHeaderConsumer, tsWriter, javaFieldsWriter); processFile(state, br, cHeaderConsumer, tsWriter, javaFieldsWriter, tsProjectConsumer);
BufferedWriter javaFields = new BufferedWriter(new FileWriter(javaConsolePath + File.separator + FIELDS_JAVA)); BufferedWriter javaFields = new BufferedWriter(new FileWriter(javaConsolePath + File.separator + FIELDS_JAVA));
javaFields.write("package com.rusefi.config;" + EOL + EOL); javaFields.write("package com.rusefi.config;" + EOL + EOL);
@ -104,7 +104,7 @@ public class ConfigDefinition {
} }
private static void processFile(ReaderState state, BufferedReader br, ConfigurationConsumer cHeaderConsumer, private static void processFile(ReaderState state, BufferedReader br, ConfigurationConsumer cHeaderConsumer,
Writer tsHeader, CharArrayWriter javaFieldsWriter) throws IOException { Writer tsHeader, CharArrayWriter javaFieldsWriter, ConfigurationConsumer tsProjectConsumer) throws IOException {
String line; String line;
cHeaderConsumer.startFile(); cHeaderConsumer.startFile();
@ -123,7 +123,7 @@ public class ConfigDefinition {
} else if (line.startsWith(STRUCT_NO_PREFIX)) { } else if (line.startsWith(STRUCT_NO_PREFIX)) {
handleStartStructure(state, line.substring(STRUCT_NO_PREFIX.length()), false); handleStartStructure(state, line.substring(STRUCT_NO_PREFIX.length()), false);
} else if (line.startsWith(END_STRUCT)) { } else if (line.startsWith(END_STRUCT)) {
handleEndStruct(state, cHeaderConsumer, tsHeader, javaFieldsWriter); handleEndStruct(state, cHeaderConsumer, tsHeader, javaFieldsWriter, tsProjectConsumer);
} else if (line.startsWith(BIT)) { } else if (line.startsWith(BIT)) {
handleBitLine(state, line); handleBitLine(state, line);
@ -202,7 +202,7 @@ public class ConfigDefinition {
} }
private static void handleEndStruct(ReaderState state, ConfigurationConsumer cHeaderConsumer, private static void handleEndStruct(ReaderState state, ConfigurationConsumer cHeaderConsumer,
Writer tsHeader, CharArrayWriter javaFieldsWriter) throws IOException { Writer tsHeader, CharArrayWriter javaFieldsWriter, ConfigurationConsumer tsProjectConsumer) throws IOException {
if (state.stack.isEmpty()) if (state.stack.isEmpty())
throw new IllegalStateException("Unexpected end_struct"); throw new IllegalStateException("Unexpected end_struct");
ConfigStructure structure = state.stack.pop(); ConfigStructure structure = state.stack.pop();
@ -218,6 +218,9 @@ public class ConfigDefinition {
tsHeader.write("; total TS size = " + totalTsSize + EOL); tsHeader.write("; total TS size = " + totalTsSize + EOL);
VariableRegistry.INSTANCE.register("TOTAL_CONFIG_SIZE", totalTsSize); VariableRegistry.INSTANCE.register("TOTAL_CONFIG_SIZE", totalTsSize);
}
if (state.stack.isEmpty()) {
structure.writeJavaFields(state,"", javaFieldsWriter, 0); structure.writeJavaFields(state,"", javaFieldsWriter, 0);
} }
} }