We have to move either forward or backwards with newparse #4441

only spot where newparse was used for real?
rusefi · Aug 15, 2022 · 784d9b5 · 784d9b5
1 parent 911eaec
commit 784d9b5
Showing 1 changed file with 3 additions and 27 deletions.
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,10 +3,6 @@
 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;
 
@@ -78,7 +74,7 @@ private int handleYaml(Map<String, Object> data, EntryHandler _handler) throws I
         JavaSensorsConsumer javaSensorsConsumer = new JavaSensorsConsumer();
         String tsOutputsDestination = "console/binary/";
 
-        OutputChannelWriter outputChannelWriter = new OutputChannelWriter(tsOutputsDestination + File.separator + "generated/output_channels.ini");
+        ConfigurationConsumer outputsSections = new OutputsSectionConsumer(tsOutputsDestination + File.separator + "generated/output_channels.ini");
 
         ConfigurationConsumer dataLogConsumer = new DataLogConsumer(tsOutputsDestination + File.separator + "generated/data_logs.ini");
 
@@ -91,11 +87,11 @@ public void onEntry(String name, String javaName, String folder, String prepend,
                 log.info("Starting " + name + " at " + startingPosition);
 
                 ReaderState state = new ReaderState();
-                String definitionInputFile = folder + File.separator + name + ".txt";
-                state.setDefinitionInputFile(definitionInputFile);
+                state.setDefinitionInputFile(folder + File.separator + name + ".txt");
                 state.withC_Defines = withCDefines;
 
                 state.addDestination(javaSensorsConsumer,
+                        outputsSections,
                         dataLogConsumer
                 );
                 FragmentDialogConsumer fragmentDialogConsumer = new FragmentDialogConsumer(name);
@@ -106,26 +102,6 @@ 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());