Revert "We have to move either forward or backwards with newparse rus…

…efi#4441" This reverts commit afc376b.
mck1117 · Aug 15, 2022 · be4f95a · be4f95a
1 parent e580a6e
commit be4f95a
Showing 1 changed file with 26 additions and 1 deletion.
diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/UsagesReader.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/UsagesReader.java
@@ -3,6 +3,10 @@
 import com.devexperts.logging.Logging;
 import com.rusefi.ConfigDefinition;
 import com.rusefi.ReaderState;
+import com.rusefi.RusefiParseErrorStrategy;
+import com.rusefi.newparse.ParseState;
+import com.rusefi.newparse.outputs.OutputChannelWriter;
+import com.rusefi.newparse.parsing.Definition;
 import com.rusefi.output.*;
 import org.yaml.snakeyaml.Yaml;
 
@@ -88,7 +92,8 @@ public void onEntry(String name, String javaName, String folder, String prepend,
                 log.info("Starting " + name + " at " + startingPosition);
 
                 ReaderState state = new ReaderState();
-                state.setDefinitionInputFile(folder + File.separator + name + ".txt");
+                String definitionInputFile = folder + File.separator + name + ".txt";
+                state.setDefinitionInputFile(definitionInputFile);
                 state.withC_Defines = withCDefines;
 
                 state.addDestination(javaSensorsConsumer);
@@ -100,6 +105,26 @@ public void onEntry(String name, String javaName, String folder, String prepend,
                 state.addJavaDestination("../java_console/models/src/main/java/com/rusefi/config/generated/" + javaName);
                 state.doJob();
 
+                {
+                    ParseState parseState = new ParseState(state.enumsReader);
+
+                    parseState.setDefinitionPolicy(Definition.OverwritePolicy.NotAllowed);
+
+                    if (prepend != null && !prepend.isEmpty()) {
+                        RusefiParseErrorStrategy.parseDefinitionFile(parseState.getListener(), prepend);
+                    }
+
+                    RusefiParseErrorStrategy.parseDefinitionFile(parseState.getListener(), definitionInputFile);
+
+                    // if (outputNames.length == 0) {
+                        outputChannelWriter.writeOutputChannels(parseState, null);
+                    // } else {
+                    //     for (int i = 0; i < outputNames.length; i++) {
+                    //         outputChannelWriter.writeOutputChannels(parseState, outputNames[i]);
+                    //     }
+                    // }
+                }
+
                 fancyNewStuff.append(fragmentDialogConsumer.getContent());
 
                 fancyNewMenu.append(fragmentDialogConsumer.menuLine());