diff --git a/examples/meta/generator/targets/java.json b/examples/meta/generator/targets/java.json index 5054f9d8156..6b1c9c5c600 100644 --- a/examples/meta/generator/targets/java.json +++ b/examples/meta/generator/targets/java.json @@ -1,5 +1,5 @@ { - "Program": "import org.shogun.*;\nimport org.jblas.*;\n\n${dependencies}class $programName {\n static {\n System.loadLibrary(\"modshogun\");\n }\n\n public static void main(String argv[]) {\n modshogun.init_shogun_with_defaults();\n\n$program\n }\n}\n", + "Program": "import org.shogun.*;\nimport org.jblas.*;\n\n${dependencies}class $programName {\nstatic {\nSystem.loadLibrary(\"modshogun\");\n}\n\npublic static void main(String argv[]) {\nmodshogun.init_shogun_with_defaults();\n\n$program\n}\n}\n", "Dependencies": { "AllDependencies": "$enumDependencies\n\n", "EnumDependencies": "$enums", @@ -7,8 +7,8 @@ "DependencyListElementEnum": "import static org.shogun.$type.$value;", "DependencyListSeparator": "\n" }, - "Statement": " $statement;\n", - "Comment": " //$comment\n", + "Statement": "$statement;\n", + "Comment": "//$comment\n", "Init": { "Construct": "$type $name = new $type($arguments)", "Copy": "$type $name = $expr" @@ -57,4 +57,4 @@ "Print": "System.out.println($expr)", "OutputDirectoryName": "java", "FileExtension": ".java" -} \ No newline at end of file +} diff --git a/examples/meta/generator/tests/test_translate_java.py b/examples/meta/generator/tests/test_translate_java.py index 973ee7c9290..7832e8da532 100644 --- a/examples/meta/generator/tests/test_translate_java.py +++ b/examples/meta/generator/tests/test_translate_java.py @@ -40,7 +40,7 @@ class MyExample { translation = self.translator.translateProgram(programAST, "MyExample") - self.assertEqual(translation, u"import org.shogun.*;\nimport org.jblas.*;\n\nclass MyExample {\n static {\n System.loadLibrary(\"modshogun\");\n }\n\n public static void main(String argv[]) {\n modshogun.init_shogun_with_defaults();\n\n CSVFile trainf = new CSVFile(\"train.dat\");\n RealFeatures feats_train = new RealFeatures(trainf);\n CSVFile testf = new CSVFile(\"test.dat\");\n\n }\n}\n") + self.assertEqual(translation, u"import org.shogun.*;\nimport org.jblas.*;\n\nclass MyExample {\nstatic {\nSystem.loadLibrary(\"modshogun\");\n}\n\npublic static void main(String argv[]) {\nmodshogun.init_shogun_with_defaults();\n\nCSVFile trainf = new CSVFile(\"train.dat\");\nRealFeatures feats_train = new RealFeatures(trainf);\nCSVFile testf = new CSVFile(\"test.dat\");\n\n}\n}\n") def test_translateProgramWithNewlines(self): programAST = [ @@ -53,7 +53,7 @@ def test_translateProgramWithNewlines(self): translation = self.translator.translateProgram(programAST, "MyExample") - self.assertEqual(translation, u"import org.shogun.*;\nimport org.jblas.*;\n\nclass MyExample {\n static {\n System.loadLibrary(\"modshogun\");\n }\n\n public static void main(String argv[]) {\n modshogun.init_shogun_with_defaults();\n\n CSVFile trainf = new CSVFile(\"train.dat\");\n\n RealFeatures feats_train = new RealFeatures(trainf);\n\n CSVFile testf = new CSVFile(\"test.dat\");\n\n }\n}\n") + self.assertEqual(translation, u"import org.shogun.*;\nimport org.jblas.*;\n\nclass MyExample {\nstatic {\nSystem.loadLibrary(\"modshogun\");\n}\n\npublic static void main(String argv[]) {\nmodshogun.init_shogun_with_defaults();\n\nCSVFile trainf = new CSVFile(\"train.dat\");\n\nRealFeatures feats_train = new RealFeatures(trainf);\n\nCSVFile testf = new CSVFile(\"test.dat\");\n\n}\n}\n") def test_translateInitCopy(self): initAST = [ @@ -100,7 +100,7 @@ def test_translateStatementAssign(self): ] } translation = self.translator.translateStatement(stmtAST) - self.assertEqual(translation, u" knn_train = false;\n") + self.assertEqual(translation, u"knn_train = false;\n") def test_translateStatementExpr(self): stmtAST = { @@ -113,7 +113,7 @@ def test_translateStatementExpr(self): } translation = self.translator.translateStatement(stmtAST) - self.assertEqual(translation, u" knn.train();\n") + self.assertEqual(translation, u"knn.train();\n") def test_translateStatementNewLine(self): stmtAST = "\n" @@ -127,7 +127,7 @@ def test_translateStatementPrint(self): translation = self.translator.translateStatement(stmtAST) - self.assertEqual(translation, u" System.out.println(multiple_k);\n") + self.assertEqual(translation, u"System.out.println(multiple_k);\n") def test_translateType(self): typeAST = { @@ -152,9 +152,9 @@ def test_translateProgramComment(self): ] translation = self.translator.translateProgram(programAST, "MyExample") - trueTranslation = u"import org.shogun.*;\nimport org.jblas.*;\n\nclass MyExample {\n static {\n System.loadLibrary(\"modshogun\");\n }\n\n public static void main(String argv[]) {\n modshogun.init_shogun_with_defaults();\n\n // This is a comment\n\n }\n}\n" + trueTranslation = u"import org.shogun.*;\nimport org.jblas.*;\n\nclass MyExample {\nstatic {\nSystem.loadLibrary(\"modshogun\");\n}\n\npublic static void main(String argv[]) {\nmodshogun.init_shogun_with_defaults();\n\n// This is a comment\n\n}\n}\n" self.assertEqual(translation, trueTranslation) if __name__ == '__main__': - unittest.main() \ No newline at end of file + unittest.main()