rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

probably no reason to use \r\n

This commit is contained in:
rusefi 2020-05-14 18:33:43 -04:00
parent fab941010e
commit 5e7f6bd93c
3 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
java_tools/enum2string.jar
View File

Binary file not shown.

50
java_tools/enum_to_string/src/com/rusefi/EnumToString.java
View File

@ -17,12 +17,12 @@ public class EnumToString {
private final static StringBuilder cppFileContent = new StringBuilder();
private final static StringBuilder includesSection = new StringBuilder();
private final static StringBuilder bothFilesHeader = new StringBuilder("// by enum2string.jar tool\r\n" +
"// on " + new Date() + "\r\n" +
"// see also gen_config_and_enums.bat\r\n" +
"\r\n" +
"\r\n" +
"\r\n");
private final static StringBuilder bothFilesHeader = new StringBuilder("// by enum2string.jar tool\n" +
"// on " + new Date() + "\n" +
"// see also gen_config_and_enums.bat\n" +
"\n" +
"\n" +
"\n");
private final static StringBuilder headerFileContent = new StringBuilder();
@ -33,9 +33,9 @@ public class EnumToString {
public static void main(String[] args) throws IOException {
if (args.length < 4) {
SystemOut.println("Please specify at least\n\n" +
KEY_INPUT_PATH + "XXX\r\n" +
KEY_INPUT_PATH + "XXX\n" +
// KEY_INPUT_FILE + "XXX" +
KEY_OUTPUT + "XXX\r\n"
KEY_OUTPUT + "XXX\n"
);
return;
}
@ -55,8 +55,8 @@ public class EnumToString {
}
headerFileContent.append("#ifndef _A_H_HEADER_\r\n");
headerFileContent.append("#define _A_H_HEADER_\r\n");
headerFileContent.append("#ifndef _A_H_HEADER_\n");
headerFileContent.append("#define _A_H_HEADER_\n");
outputData();
@ -65,12 +65,12 @@ public class EnumToString {
cppFileContent.insert(0, includesSection);
headerFileContent.insert(0, includesSection);
SystemOut.println("includesSection:\r\n" + includesSection + "end of includesSection\r\n");
SystemOut.println("includesSection:\n" + includesSection + "end of includesSection\n");
cppFileContent.insert(0, "#include \"global.h\"\r\n");
cppFileContent.insert(0, "#include \"global.h\"\n");
headerFileContent.insert(0, bothFilesHeader.toString());
headerFileContent.append("#endif /*_A_H_HEADER_ */\r\n");
headerFileContent.append("#endif /*_A_H_HEADER_ */\n");
new File(outputPath).mkdirs();
writeCppAndHeaderFiles(outputPath + File.separator + "auto_generated_enums");
@ -93,21 +93,21 @@ public class EnumToString {
String simpleFileName = f.getName();
bothFilesHeader.insert(0, "// " +
LazyFile.LAZY_FILE_TAG + " from " + simpleFileName + "\r\n");
LazyFile.LAZY_FILE_TAG + " from " + simpleFileName + "\n");
includesSection.append("#include \"" + simpleFileName + "\"\r\n");
includesSection.append("#include \"" + simpleFileName + "\"\n");
EnumsReader.process(new FileReader(inFileName));
}
public static void outputData() {
SystemOut.println("Preparing output for " + EnumsReader.enums.size() + " enums\r\n");
SystemOut.println("Preparing output for " + EnumsReader.enums.size() + " enums\n");
for (Map.Entry<String, Map<String, Value>> e : EnumsReader.enums.entrySet()) {
String enumName = e.getKey();
cppFileContent.append(makeCode(enumName, e.getValue().values()));
headerFileContent.append(getMethodSignature(enumName) + ";\r\n");
headerFileContent.append(getMethodSignature(enumName) + ";\n");
}
SystemOut.println("EnumToString: " + headerFileContent.length() + " bytes of content\r\n");
SystemOut.println("EnumToString: " + headerFileContent.length() + " bytes of content\n");
}
public static void clear() {
@ -116,18 +116,18 @@ public class EnumToString {
private static String makeCode(String enumName, Collection<Value> values) {
StringBuilder sb = new StringBuilder();
sb.append(getMethodSignature(enumName) + "{\r\n");
sb.append(getMethodSignature(enumName) + "{\n");
sb.append("switch(value) {\r\n");
sb.append("switch(value) {\n");
for (Value e : values) {
sb.append("case " + e.getName() + ":\r\n");
sb.append(" return \"" + e.getName() + "\";\r\n");
sb.append("case " + e.getName() + ":\n");
sb.append(" return \"" + e.getName() + "\";\n");
}
sb.append(" }\r\n");
sb.append(" return NULL;\r\n");
sb.append("}\r\n");
sb.append(" }\n");
sb.append(" return NULL;\n");
sb.append("}\n");
return sb.toString();
}

36
java_tools/enum_to_string/src/com/rusefi/EnumToStringTest.java
View File

@ -40,15 +40,15 @@ public class EnumToStringTest {
assertEquals("GPIO_INVALID", values.get(0).getName());
assertEquals("1", values.get(0).getValue());
assertEquals("const char *getBrain_pin_e(brain_pin_e value){\r\n" +
"switch(value) {\r\n" +
"case GPIO_INVALID:\r\n" +
" return \"GPIO_INVALID\";\r\n" +
"case GPIO_UNASSIGNED:\r\n" +
" return \"GPIO_UNASSIGNED\";\r\n" +
" }\r\n" +
" return NULL;\r\n" +
"}\r\n", EnumToString.getCppFileContent());
assertEquals("const char *getBrain_pin_e(brain_pin_e value){\n" +
"switch(value) {\n" +
"case GPIO_INVALID:\n" +
" return \"GPIO_INVALID\";\n" +
"case GPIO_UNASSIGNED:\n" +
" return \"GPIO_UNASSIGNED\";\n" +
" }\n" +
" return NULL;\n" +
"}\n", EnumToString.getCppFileContent());
}
@Test
@ -59,14 +59,14 @@ public class EnumToStringTest {
"\tGPIO_UNASSIGNED = 0,\n" +
"\tGPIO_INVALID = 1,\n" +
"} brain_pin_e ;"));
assertEquals("const char *getBrain_pin_e(brain_pin_e value){\r\n" +
"switch(value) {\r\n" +
"case GPIO_INVALID:\r\n" +
" return \"GPIO_INVALID\";\r\n" +
"case GPIO_UNASSIGNED:\r\n" +
" return \"GPIO_UNASSIGNED\";\r\n" +
" }\r\n" +
" return NULL;\r\n" +
"}\r\n", EnumToString.getCppFileContent());
assertEquals("const char *getBrain_pin_e(brain_pin_e value){\n" +
"switch(value) {\n" +
"case GPIO_INVALID:\n" +
" return \"GPIO_INVALID\";\n" +
"case GPIO_UNASSIGNED:\n" +
" return \"GPIO_UNASSIGNED\";\n" +
" }\n" +
" return NULL;\n" +
"}\n", EnumToString.getCppFileContent());
}
}