From 5e7f6bd93ce8fdc56c7a4bbc504d45340aab37e6 Mon Sep 17 00:00:00 2001 From: rusefi Date: Thu, 14 May 2020 18:33:43 -0400 Subject: [PATCH] probably no reason to use \r\n --- java_tools/enum2string.jar | Bin 19730 -> 19706 bytes .../src/com/rusefi/EnumToString.java | 50 +++++++++--------- .../src/com/rusefi/EnumToStringTest.java | 36 ++++++------- 3 files changed, 43 insertions(+), 43 deletions(-) diff --git a/java_tools/enum2string.jar b/java_tools/enum2string.jar index 4c196b0405bd8030ce0180078cad75ea661f4531..adf8ae39c1c293080b58d14117a5a14bb3bdd05c 100644 GIT binary patch delta 5071 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 diff --git a/java_tools/enum_to_string/src/com/rusefi/EnumToString.java b/java_tools/enum_to_string/src/com/rusefi/EnumToString.java index bdf1c1fd77..ed2353d0d8 100644 --- a/java_tools/enum_to_string/src/com/rusefi/EnumToString.java +++ b/java_tools/enum_to_string/src/com/rusefi/EnumToString.java @@ -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> 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 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(); } diff --git a/java_tools/enum_to_string/src/com/rusefi/EnumToStringTest.java b/java_tools/enum_to_string/src/com/rusefi/EnumToStringTest.java index d0db6d667a..603a83bbb0 100644 --- a/java_tools/enum_to_string/src/com/rusefi/EnumToStringTest.java +++ b/java_tools/enum_to_string/src/com/rusefi/EnumToStringTest.java @@ -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()); } }