Applied patches and added tests for empty array declarations, trailing F on floats, and additional variable-keyword subsitutions. See issue natural#27, issue natural#28, and issue natural#29.

Troy Melhase · Troy Melhase · commit 2db365e16461 · 2007-09-25T21:21:59.000Z
diff --git a/java2python/lib/defaultconfig.py b/java2python/lib/defaultconfig.py
@@ -105,13 +105,21 @@
     'Vector':'[]',
     'boolean':'False',
     'str':'""',
+    '[':'None',
 }
 
 ## method name mapping.  user-defined configuration modules can
 ## replace and/or augment this with their own.
 renameMethodMap = {
     'equals':'__eq__',
+    'and':'and_',
+    'del':'del_',
+    'elif':'elif_',
+    'in':'in_',
     'is':'is_',
+    'not':'not_',
+    'or':'or_',
+    'print':'print_',
 }
 
 ## generic name mapping.  user-defined configuration modules can
@@ -121,7 +129,14 @@
     'null':'None',
     'false':'False',
     'true':'True',
+    'and':'and_',
+    'del':'del_',
+    'elif':'elif_',
+    'in':'in_',
     'is':'is_',
+    'not':'not_',
+    'or':'or_',
+    'print':'print_',
     'str':'strval',
 }
 
@@ -152,7 +167,14 @@
 
 variableNameMapping = {
     'str':'strval',
+    'and':'and_',
+    'del':'del_',
+    'elif':'elif_',
+    'in':'in_',
     'is':'is_',
+    'not':'not_',
+    'or':'or_',
+    'print':'print_',
     }
 
 
diff --git a/java2python/lib/walker.g b/java2python/lib/walker.g
@@ -810,7 +810,7 @@ returns [value]
     :   i0:NUM_INT        {value = i0.getText()}
     |   c0:CHAR_LITERAL   {value = c0.getText()}
     |   s0:STRING_LITERAL {value = s0.getText()}
-    |   f0:NUM_FLOAT      {value = f0.getText()}
+    |   f0:NUM_FLOAT      {value = f0.getText().rstrip("fF")}
     |   d0:NUM_DOUBLE     {value = d0.getText()}
     |   l0:NUM_LONG       {value = l0.getText()}
     ;
diff --git a/java2python/tests/EmptyArray.java b/java2python/tests/EmptyArray.java
@@ -0,0 +1,6 @@
+class EmptyArray {
+    int [] b;
+    public static void main(String[] args) {
+    }
+
+}
diff --git a/java2python/tests/FloatFix.java b/java2python/tests/FloatFix.java
@@ -0,0 +1,6 @@
+class FloatFix {
+    public static void main(String[] args) {
+	float b = 1.2f;
+        System.out.println(b);
+    }
+}
diff --git a/java2python/tests/Keywords.java b/java2python/tests/Keywords.java
@@ -0,0 +1,31 @@
+class Keywords {
+    public static void main(String[] args) {
+	String and = "this is and";
+        System.out.println(and);	
+
+	String del = "this is del";
+        System.out.println(del);
+
+	String elif = "this is elif";
+        System.out.println(elif);
+
+	String in = "this is in";
+        System.out.println(in);
+
+	String is = "this is is";
+        System.out.println(is);
+
+	String not = "this is not";
+        System.out.println(not);
+
+	String or = "this is or";
+        System.out.println(or);
+
+	String print = "this is print";
+        System.out.println(print);
+
+	String str = "this is str";
+        System.out.println(str);
+
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -810,7 +810,7 @@ returns [value]`
`810`	`810`	`: i0:NUM_INT {value = i0.getText()}`
`811`	`811`	`\| c0:CHAR_LITERAL {value = c0.getText()}`
`812`	`812`	`\| s0:STRING_LITERAL {value = s0.getText()}`
`813`		`- \| f0:NUM_FLOAT {value = f0.getText()}`
	`813`	`+ \| f0:NUM_FLOAT {value = f0.getText().rstrip("fF")}`
`814`	`814`	`\| d0:NUM_DOUBLE {value = d0.getText()}`
`815`	`815`	`\| l0:NUM_LONG {value = l0.getText()}`
`816`	`816`	`;`