We have to move either forward or backwards with newparse fix #4441
This commit is contained in:
parent
72292e561a
commit
9cae8ecc8c
|
@ -15,6 +15,7 @@ import java.util.regex.Pattern;
|
||||||
import static com.devexperts.logging.Logging.getLogging;
|
import static com.devexperts.logging.Logging.getLogging;
|
||||||
import static com.rusefi.output.JavaSensorsConsumer.quote;
|
import static com.rusefi.output.JavaSensorsConsumer.quote;
|
||||||
|
|
||||||
|
import com.rusefi.parse.TypesHelper;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -278,7 +279,7 @@ public class ConfigFieldImpl implements ConfigField {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @see com.rusefi.newparse.parsing.Type
|
* @see TypesHelper
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public String getType() {
|
public String getType() {
|
||||||
|
|
|
@ -5,6 +5,7 @@ import com.opensr5.ini.RawIniFile;
|
||||||
import com.opensr5.ini.field.EnumIniField;
|
import com.opensr5.ini.field.EnumIniField;
|
||||||
import com.rusefi.enum_reader.Value;
|
import com.rusefi.enum_reader.Value;
|
||||||
import com.rusefi.output.*;
|
import com.rusefi.output.*;
|
||||||
|
import com.rusefi.parse.TypesHelper;
|
||||||
import com.rusefi.util.IoUtils;
|
import com.rusefi.util.IoUtils;
|
||||||
import com.rusefi.util.SystemOut;
|
import com.rusefi.util.SystemOut;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
package com.rusefi.output;
|
package com.rusefi.output;
|
||||||
|
|
||||||
import com.rusefi.*;
|
import com.rusefi.*;
|
||||||
|
import com.rusefi.parse.TypesHelper;
|
||||||
|
|
||||||
import static com.rusefi.ToolUtil.EOL;
|
import static com.rusefi.ToolUtil.EOL;
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
package com.rusefi.output;
|
package com.rusefi.output;
|
||||||
|
|
||||||
import com.rusefi.*;
|
import com.rusefi.*;
|
||||||
|
import com.rusefi.parse.TypesHelper;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
|
|
|
@ -3,7 +3,7 @@ package com.rusefi.output;
|
||||||
import com.rusefi.ConfigField;
|
import com.rusefi.ConfigField;
|
||||||
import com.rusefi.ConfigFieldImpl;
|
import com.rusefi.ConfigFieldImpl;
|
||||||
import com.rusefi.ReaderState;
|
import com.rusefi.ReaderState;
|
||||||
import com.rusefi.TypesHelper;
|
import com.rusefi.parse.TypesHelper;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@ package com.rusefi.output;
|
||||||
|
|
||||||
import com.rusefi.ConfigField;
|
import com.rusefi.ConfigField;
|
||||||
import com.rusefi.ReaderState;
|
import com.rusefi.ReaderState;
|
||||||
import com.rusefi.TypesHelper;
|
import com.rusefi.parse.TypesHelper;
|
||||||
import com.rusefi.output.variables.VariableRecord;
|
import com.rusefi.output.variables.VariableRecord;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
|
@ -2,7 +2,7 @@ package com.rusefi.output;
|
||||||
|
|
||||||
import com.rusefi.ConfigField;
|
import com.rusefi.ConfigField;
|
||||||
import com.rusefi.ReaderState;
|
import com.rusefi.ReaderState;
|
||||||
import com.rusefi.TypesHelper;
|
import com.rusefi.parse.TypesHelper;
|
||||||
import com.rusefi.output.variables.VariableRecord;
|
import com.rusefi.output.variables.VariableRecord;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
|
|
|
@ -4,8 +4,8 @@ import com.opensr5.ini.field.IniField;
|
||||||
import com.rusefi.ConfigField;
|
import com.rusefi.ConfigField;
|
||||||
import com.rusefi.ConfigFieldImpl;
|
import com.rusefi.ConfigFieldImpl;
|
||||||
import com.rusefi.ReaderState;
|
import com.rusefi.ReaderState;
|
||||||
import com.rusefi.TypesHelper;
|
import com.rusefi.parse.Type;
|
||||||
import com.rusefi.newparse.parsing.Type;
|
import com.rusefi.parse.TypesHelper;
|
||||||
|
|
||||||
import java.util.TreeSet;
|
import java.util.TreeSet;
|
||||||
|
|
||||||
|
|
|
@ -2,6 +2,7 @@ package com.rusefi.test;
|
||||||
|
|
||||||
import com.rusefi.*;
|
import com.rusefi.*;
|
||||||
import com.rusefi.output.*;
|
import com.rusefi.output.*;
|
||||||
|
import com.rusefi.parse.TypesHelper;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
import static org.junit.Assert.*;
|
import static org.junit.Assert.*;
|
||||||
|
|
|
@ -2,6 +2,7 @@ package com.rusefi.output;
|
||||||
|
|
||||||
import com.opensr5.ini.IniFileModel;
|
import com.opensr5.ini.IniFileModel;
|
||||||
import com.rusefi.*;
|
import com.rusefi.*;
|
||||||
|
import com.rusefi.parse.TypesHelper;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
package com.rusefi.newparse.parsing;
|
package com.rusefi.parse;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* todo: migrate from TypesHelper to this class?
|
||||||
|
*/
|
||||||
public enum Type {
|
public enum Type {
|
||||||
U08("uint8_t", "U08", 1),
|
U08("uint8_t", "U08", 1),
|
||||||
S08("int8_t", "S08", 1),
|
S08("int8_t", "S08", 1),
|
|
@ -1,10 +1,12 @@
|
||||||
package com.rusefi;
|
package com.rusefi.parse;
|
||||||
|
|
||||||
|
import com.rusefi.ReaderState;
|
||||||
import com.rusefi.util.SystemOut;
|
import com.rusefi.util.SystemOut;
|
||||||
|
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* TODO: migrate to Type?
|
||||||
* 1/22/15
|
* 1/22/15
|
||||||
*/
|
*/
|
||||||
public class TypesHelper {
|
public class TypesHelper {
|
Loading…
Reference in New Issue