-
-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
new parser writes java fields (#525)
* get definitions and by integer * implement basic * implement 1d array * java field array of structs * cleanup * cleanup * jar
- Loading branch information
Showing
5 changed files
with
175 additions
and
27 deletions.
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
151 changes: 143 additions & 8 deletions
151
.../configuration_definition/src/main/java/com/rusefi/newparse/outputs/JavaFieldsWriter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,160 @@ | ||
| package com.rusefi.newparse.outputs; | ||
|
|
||
| import com.rusefi.VariableRegistry; | ||
| import com.rusefi.newparse.ParseState; | ||
| import com.rusefi.newparse.layout.StructLayout; | ||
| import com.rusefi.newparse.layout.*; | ||
| import com.rusefi.newparse.parsing.Definition; | ||
| import com.rusefi.newparse.parsing.Struct; | ||
|
|
||
| import java.io.FileNotFoundException; | ||
| import java.io.FileOutputStream; | ||
| import java.io.PrintStream; | ||
| import java.io.*; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Paths; | ||
| import java.util.Comparator; | ||
| import java.util.Map; | ||
| import java.util.stream.Collectors; | ||
| import java.util.stream.Stream; | ||
|
|
||
| public class JavaFieldsWriter { | ||
| private final PrintStream ps; | ||
|
|
||
| public JavaFieldsWriter(String outputFile, String javaConstants) throws FileNotFoundException { | ||
| this.ps = new PrintStreamAlwaysUnix(new FileOutputStream(outputFile)); | ||
| private final int baseOffset; | ||
|
|
||
| ps.println(javaConstants); | ||
| public JavaFieldsWriter(final String outputFile, int baseOffset) throws IOException { | ||
| ps = new PrintStreamAlwaysUnix(Files.newOutputStream(Paths.get(outputFile))); | ||
| this.baseOffset = baseOffset; | ||
|
|
||
| String className = new File(outputFile).getName(); | ||
| ps.println("package com.rusefi.config.generated;"); | ||
| ps.println(); | ||
| ps.println("import com.rusefi.config.*;"); | ||
| ps.println(); | ||
| ps.println("public class " + className.substring(0, className.indexOf('.')) + " {"); | ||
| } | ||
|
|
||
| public void finish() { | ||
| ps.println("}"); | ||
| ps.close(); | ||
| } | ||
|
|
||
| public void writeDefinitions(final Map<String, Definition> defs) { | ||
| Stream<Map.Entry<String, Definition>> sortedDefs = defs.entrySet().stream().sorted(Map.Entry.comparingByKey()); | ||
|
|
||
| for (final Map.Entry<String, Definition> d : sortedDefs.collect(Collectors.toList())) { | ||
| String name = d.getKey(); | ||
|
|
||
| if (name.endsWith(VariableRegistry._16_HEX_SUFFIX) || name.endsWith(VariableRegistry._HEX_SUFFIX)) { | ||
| continue; | ||
| } | ||
|
|
||
| ps.print("\tpublic static final "); | ||
|
|
||
| if (d.getValue().isInteger()) { | ||
| ps.print("int " + d.getKey() + " = " + d.getValue().asInt()); | ||
| } else if (d.getValue().isNumeric()) { | ||
| ps.print("double " + d.getKey() + " = " + d.getValue().asDouble()); | ||
| } else { | ||
| ps.print("String " + d.getKey() + " = " + d.getValue().toString()); | ||
| } | ||
|
|
||
| ps.println(";"); | ||
| } | ||
| } | ||
|
|
||
| public void writeJavaFields(ParseState parser) { | ||
| public void writeFields(ParseState parser) { | ||
| // Assume the last struct is the one we want... | ||
| Struct s = parser.getStructs().get(parser.getStructs().size() - 1); | ||
|
|
||
| StructLayout sl = new StructLayout(0, "root", s); | ||
|
|
||
| JavaFieldVisitor visitor = new JavaFieldVisitor(); | ||
| StructNamePrefixer prefixer = new StructNamePrefixer('_'); | ||
|
|
||
| visitor.visitRoot(sl, ps, prefixer); | ||
| } | ||
|
|
||
| private class JavaFieldVisitor extends ILayoutVisitor { | ||
| public void visitRoot(StructLayout sl, PrintStream ps, StructNamePrefixer prefixer) { | ||
| sl.children.forEach(c -> c.visit(this, ps, prefixer, 0, new int[0])); | ||
| } | ||
|
|
||
| public void visit(StructLayout struct, PrintStream ps, StructNamePrefixer prefixer, int offsetAdd, int[] arrayDims) { | ||
| if (arrayDims.length == 0) { | ||
| visit(struct, ps, prefixer, offsetAdd, struct.name.toUpperCase()); | ||
| } else if (arrayDims.length == 1) { | ||
| int elementOffset = offsetAdd + struct.offset; | ||
| for (int i = 0; i < arrayDims[0]; i++) { | ||
| visit(struct, ps, prefixer, elementOffset, struct.name.toUpperCase() + (i + 1)); | ||
| elementOffset += struct.size; | ||
| } | ||
| } else { | ||
| throw new IllegalStateException("Java fields don't support multi dimension arrays of structs"); | ||
| } | ||
| } | ||
|
|
||
| private String toJavaType(String tsType) { | ||
| switch (tsType) { | ||
| case "S08": | ||
| case "U08": return "INT8"; | ||
| case "S16": | ||
| case "U16": return "INT16"; | ||
| case "S32": | ||
| case "U32": return "INT"; | ||
| case "F32": return "FLOAT"; | ||
| } | ||
|
|
||
| throw new IllegalArgumentException("toJavaType didn't understand " + tsType); | ||
| } | ||
|
|
||
| private void visit(ScalarLayout scalar, PrintStream ps, StructNamePrefixer prefixer, int offsetAdd, int idx) { | ||
| String name = prefixer.get(scalar.name.toUpperCase()); | ||
| if (idx != -1) { | ||
| name = name + idx; | ||
| } | ||
|
|
||
| ps.print("\tpublic static final Field "); | ||
| ps.print(name); | ||
| ps.print(" = Field.create(\""); | ||
| ps.print(name); | ||
| ps.print("\", "); | ||
| ps.print(scalar.offset + offsetAdd); | ||
| ps.print(", FieldType."); | ||
| ps.print(toJavaType(scalar.type.tsType)); | ||
|
|
||
| // if (scalar.options.scale != 1) { | ||
| if (!scalar.type.tsType.equals("F32")) { | ||
| ps.print(").setScale("); | ||
| ps.print(scalar.options.scale); | ||
| } | ||
|
|
||
| ps.print(").setBaseOffset("); | ||
|
|
||
| // TODO | ||
| ps.print(baseOffset); | ||
|
|
||
| ps.println(");"); | ||
| } | ||
|
|
||
| public void visit(ScalarLayout scalar, PrintStream ps, StructNamePrefixer prefixer, int offsetAdd, int[] arrayDims) { | ||
| if (arrayDims.length == 0) { | ||
| visit(scalar, ps, prefixer, offsetAdd, -1); | ||
| } else if (arrayDims.length == 1) { | ||
| int elementOffset = offsetAdd; | ||
|
|
||
| for (int i = 0; i < arrayDims[0]; i++) { | ||
| visit(scalar, ps, prefixer, elementOffset, i + 1); | ||
| elementOffset += scalar.type.size; | ||
| } | ||
| } else { | ||
| throw new IllegalStateException("Output channels don't support multi dimension arrays"); | ||
| } | ||
| } | ||
|
|
||
| public void visit(BitGroupLayout bitGroup, PrintStream ps, StructNamePrefixer prefixer, int offsetAdd, int[] arrayDims) { | ||
| } | ||
|
|
||
| @Override | ||
| public void visit(UnusedLayout struct, PrintStream ps, StructNamePrefixer prefixer, int offsetAdd, int[] arrayDims) { | ||
| // Do nothing | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters