Cast fully handled. For objects and primitives

iuliux · iuliux · commit db60b700980f · 2012-04-24T00:03:54.000+03:00
diff --git a/java2python/compiler/visitor.py b/java2python/compiler/visitor.py
@@ -689,7 +689,7 @@ def acceptPreformatted(self, node, memo):
     acceptUnaryMinus = makeNodePreformattedExpr('-' + FS.l)
     acceptUnaryPlus = makeNodePreformattedExpr('+' + FS.l)
 
-    def acceptCastExpr(self, node, memo): # problem?
+    def acceptCastExpr(self, node, memo):
         """ Accept and process a cast expression. """
         # If the type of casting is a primitive type,
         # then do the cast, else drop it.
@@ -699,12 +699,21 @@ def acceptCastExpr(self, node, memo): # problem?
         typeName = typeIdent.text
         if typeIdent.type == tokens.QUALIFIED_TYPE_IDENT:
             typeName = typeIdent.firstChild().text
-
+        
         if typeName in tokens.primitiveTypeNames:
             # Cast using the primitive type constructor
             self.fs = typeName + '(' + FS.r + ')'
         else:
-            self.fs = FS.r
+            mode = self.config.last('objCastMode')
+            if mode == 'drop':
+                # Use drop policy
+                self.fs = FS.r
+            elif mode == 'ctor':
+                # Make constructor
+                self.fs = FS.l + '(' + FS.r + ')'
+            else:
+                warn('Couldn\'t perform cast operation. ' + typeName + \
+                    ' is not a primitive and objCastMode in the config file has wrong value.')
         self.left, self.right = visitors = factory(parent=self), factory(parent=self)
         self.zipWalk(node.children, visitors, memo)
 
diff --git a/java2python/config/default.py b/java2python/config/default.py
@@ -173,6 +173,15 @@
 # convenience.
 
 
+# Specifies how cast operations of non-primitive types are handled
+# (primitive types are automatically handled)
+# Valid values:
+#     - 'drop': completely drops type and cast info
+#     - 'ctor': converts the cast in a constructor call
+#               E.g.: (Cast) x -> Cast(x)
+objCastMode = 'drop'
+
+
 # module output subs.
 moduleOutputSubs = [
     (r'System\.out\.println\((.*)\)', r'print \1'),
