fixed setting the instance type on assignment when calling a method and the method returns a known type.

hartsantler · hartsantler · commit 0c3fb719420b · 2013-10-05T19:51:25.000-07:00
diff --git a/pythonscript/python_to_pythonjs.py b/pythonscript/python_to_pythonjs.py
@@ -475,7 +475,8 @@ def visit_Assign(self, node):
                         #writer.write( '''JS('%s( [%s, %s] )')''' %(setter, name, self.visit(node.value)) )  ## can not nest have nested JS() calls
                         writer.write( '%s( [%s, %s] )' %(setter, name, self.visit(node.value)) )
                         fallback = False
-
+                else:
+                    writer.write('#!!!! class is known: %s' %klass)
 
             if fallback:
                 code = 'set_attribute(%s, "%s", %s)' % (
@@ -492,19 +493,23 @@ def visit_Assign(self, node):
                 self._instances[ target.id ] = node.value.func.id  ## keep track of instances
             elif isinstance(node.value, Call) and isinstance(node.value.func, Name) and node.value.func.id in self._function_return_types:
                 self._instances[ target.id ] = self._function_return_types[ node.value.func.id ]
-            elif target.id in self._instances:
-                self._instances.pop( target.id )  ## TODO is this correct?
-
-            if isinstance(node.value, Name):  ## if this is a simple copy: "a = b" and "b" is known to be of some class
-                name = self.visit(node.value)
-                if name in self._instances: self._instances[ target.id ] = self._instances[ name ]
-                writer.write('%s = %s' % (target.id, name))
+            elif isinstance(node.value, Call) and isinstance(node.value.func, Attribute) and node.value.func.value.id in self._instances:
+                typedef = self.get_typedef( node.value.func.value )
+                method = node.value.func.attr
+                if method in typedef.methods:
+                    func = typedef.get_pythonjs_function_name( method )
+                    if func in self._function_return_types:
+                        self._instances[ target.id ] = self._function_return_types[ func ]
+
+            elif isinstance(node.value, Name) and node_value in self._instances:  ## if this is a simple copy: "a = b" and "b" is known to be of some class
+                self._instances[ target.id ] = self._instances[ node_value ]
             elif isinstance(node.value, BinOp) and hasattr(node.value, 'operator_overloading') and node.value.operator_overloading in self._function_return_types:
                 self._instances[ target.id ] = self._function_return_types[ node.value.operator_overloading ]
-                writer.write('%s = %s' % (target.id, node_value))
 
-            else: ## blind assignment
-                writer.write('%s = %s' % (target.id, node_value))
+            elif target.id in self._instances:
+                self._instances.pop( target.id )
+
+            writer.write('%s = %s' % (target.id, node_value))
 
         else:  # it's a Tuple
             id = self.identifier
diff --git a/tests/threejs_vector3_operator_overloading.html b/tests/threejs_vector3_operator_overloading.html
@@ -40,7 +40,9 @@
 	show_vec(b)
 
 	c = b.clone()
-	assert isinstance(c, Vector3)
+	c.normalize()
+	print( c.x )
+	v1.normalize()
 	c ^= v1  ## cross product
 	show_vec(c)
 
