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

rusefi · Jun 16, 2023 · 9cae8ec · 9cae8ec
1 parent 72292e5
commit 9cae8ec
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 8 deletions.
diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigFieldImpl.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigFieldImpl.java
@@ -15,6 +15,7 @@
 import static com.devexperts.logging.Logging.getLogging;
 import static com.rusefi.output.JavaSensorsConsumer.quote;
 
+import com.rusefi.parse.TypesHelper;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -278,7 +279,7 @@ public String getName() {
     }
 
     /**
-     * @see com.rusefi.newparse.parsing.Type
+     * @see TypesHelper
      */
     @Override
     public String getType() {

diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/ReaderStateImpl.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ReaderStateImpl.java
@@ -5,6 +5,7 @@
 import com.opensr5.ini.field.EnumIniField;
 import com.rusefi.enum_reader.Value;
 import com.rusefi.output.*;
+import com.rusefi.parse.TypesHelper;
 import com.rusefi.util.IoUtils;
 import com.rusefi.util.SystemOut;
 import org.jetbrains.annotations.NotNull;

diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/BaseCHeaderConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/BaseCHeaderConsumer.java
@@ -1,6 +1,7 @@
 package com.rusefi.output;
 
 import com.rusefi.*;
+import com.rusefi.parse.TypesHelper;
 
 import static com.rusefi.ToolUtil.EOL;
 

diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/ConfigStructureImpl.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/ConfigStructureImpl.java
@@ -1,6 +1,7 @@
 package com.rusefi.output;
 
 import com.rusefi.*;
+import com.rusefi.parse.TypesHelper;
 
 import java.util.ArrayList;
 import java.util.HashSet;

diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/DataLogConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/DataLogConsumer.java
@@ -3,7 +3,7 @@
 import com.rusefi.ConfigField;
 import com.rusefi.ConfigFieldImpl;
 import com.rusefi.ReaderState;
-import com.rusefi.TypesHelper;
+import com.rusefi.parse.TypesHelper;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/...ools/configuration_definition/src/main/java/com/rusefi/output/GetConfigValueConsumer.java b/...ools/configuration_definition/src/main/java/com/rusefi/output/GetConfigValueConsumer.java
@@ -2,7 +2,7 @@
 
 import com.rusefi.ConfigField;
 import com.rusefi.ReaderState;
-import com.rusefi.TypesHelper;
+import com.rusefi.parse.TypesHelper;
 import com.rusefi.output.variables.VariableRecord;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

diff --git a/...ools/configuration_definition/src/main/java/com/rusefi/output/GetOutputValueConsumer.java b/...ools/configuration_definition/src/main/java/com/rusefi/output/GetOutputValueConsumer.java
@@ -2,7 +2,7 @@
 
 import com.rusefi.ConfigField;
 import com.rusefi.ReaderState;
-import com.rusefi.TypesHelper;
+import com.rusefi.parse.TypesHelper;
 import com.rusefi.output.variables.VariableRecord;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/TsOutput.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/TsOutput.java
@@ -4,8 +4,8 @@
 import com.rusefi.ConfigField;
 import com.rusefi.ConfigFieldImpl;
 import com.rusefi.ReaderState;
-import com.rusefi.TypesHelper;
-import com.rusefi.newparse.parsing.Type;
+import com.rusefi.parse.Type;
+import com.rusefi.parse.TypesHelper;
 
 import java.util.TreeSet;
 

diff --git a/java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigFieldParserTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigFieldParserTest.java
@@ -2,6 +2,7 @@
 
 import com.rusefi.*;
 import com.rusefi.output.*;
+import com.rusefi.parse.TypesHelper;
 import org.junit.Test;
 
 import static org.junit.Assert.*;

diff --git a/...ols/configuration_definition_base/src/main/java/com/rusefi/output/JavaFieldsConsumer.java b/...ols/configuration_definition_base/src/main/java/com/rusefi/output/JavaFieldsConsumer.java
@@ -2,6 +2,7 @@
 
 import com.opensr5.ini.IniFileModel;
 import com.rusefi.*;
+import com.rusefi.parse.TypesHelper;
 
 import java.io.IOException;
 import java.util.HashSet;

diff --git a/...ava/com/rusefi/newparse/parsing/Type.java → .../src/main/java/com/rusefi/parse/Type.java b/...ava/com/rusefi/newparse/parsing/Type.java → .../src/main/java/com/rusefi/parse/Type.java
@@ -1,5 +1,8 @@
-package com.rusefi.newparse.parsing;
+package com.rusefi.parse;
 
+/**
+ * todo: migrate from TypesHelper to this class?
+ */
 public enum Type {
     U08("uint8_t", "U08", 1),
     S08("int8_t", "S08", 1),

diff --git a/...src/main/java/com/rusefi/TypesHelper.java → ...in/java/com/rusefi/parse/TypesHelper.java b/...src/main/java/com/rusefi/TypesHelper.java → ...in/java/com/rusefi/parse/TypesHelper.java
@@ -1,10 +1,12 @@
-package com.rusefi;
+package com.rusefi.parse;
 
+import com.rusefi.ReaderState;
 import com.rusefi.util.SystemOut;
 
 import java.util.Objects;
 
 /**
+ * TODO: migrate to Type?
  * 1/22/15
  */
 public class TypesHelper {