Extends AST type replacements with remaining primitive types.

Troy Melhase · Troy Melhase · commit 764be761d5c8 · 2012-04-23T12:38:25.000-04:00
diff --git a/java2python/config/default.py b/java2python/config/default.py
@@ -148,15 +148,13 @@
     (Type('TRUE'),  transform.true2True),
     (Type('IDENT'), transform.keywordSafeIdent),
 
+    (Type('FLOATING_POINT_LITERAL'), transform.syntaxSafeFloatLiteral),
 
-    (Type('FLOATING_POINT_LITERAL'),
-     transform.syntaxSafeFloatLiteral),
-
-    (Type('TYPE') > Type('BOOLEAN'),
-     transform.typeSub),
-
-    (Type('TYPE') > Type('DOUBLE'),
-     transform.typeSub),
+    (Type('TYPE') > Type('BOOLEAN'), transform.typeSub),
+    (Type('TYPE') > Type('BYTE'), transform.typeSub),
+    (Type('TYPE') > Type('CHAR'), transform.typeSub),
+    (Type('TYPE') > Type('DOUBLE'), transform.typeSub),
+    (Type('TYPE') > Type('SHORT'), transform.typeSub),
 
     (Type('TYPE') > Type('QUALIFIED_TYPE_IDENT') > Type('IDENT'),
      transform.typeSub),
@@ -202,6 +200,8 @@
     'boolean' : 'bool',
     'IndexOutOfBoundsException' : 'IndexError',
     'Integer' : 'int',
+    'short' : 'int',
+    'byte' : 'int',
     'Object' : 'object',
     'String' : 'str',
     'char' : 'str',
diff --git a/test/BasicTypes1.java b/test/BasicTypes1.java
@@ -0,0 +1,17 @@
+class BasicTypes1 {
+    char chr;
+    byte byt;
+    short shr;
+    int in_t;
+    long lng;
+    float flt;
+    double dbl;
+
+    public static void main(String[] args) {
+        BasicTypes1 bt1 = new BasicTypes1();
+        System.out.println(bt1.byt);
+        System.out.println(bt1.shr);
+        System.out.println(bt1.in_t);
+    }
+
+}
