dart backend: fixed passing type info and started on prototype for SIMD support.

hartsantler · hartsantler · commit 95fae01321ea · 2014-06-12T21:59:36.000-07:00
diff --git a/pythonjs/ast_utils.py b/pythonjs/ast_utils.py
@@ -46,6 +46,12 @@ def retrieve_vars(body):
 						local_vars.add( '%s=%s' %(user_typedef, u.id) )
 						user_typedef = None
 					else:
+						#add = True   ## TODO this should work?!
+						#for x in local_vars:
+						#	if u.id == x or ('=' in x and x.split('=')[-1] == u.id):
+						#		add = False
+						#		break
+						#if add:
 						local_vars.add( u.id )
 
 				elif isinstance(u, ast.Tuple):
diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
@@ -2495,6 +2495,7 @@ def visit_FunctionDef(self, node):
 		## the dart backend can use this extra type information.
 		vars = []
 		local_typedefs = []
+		local_typedef_names = set()
 		if not self._with_coffee:
 			local_vars, global_vars = retrieve_vars(node.body)
 			local_vars = local_vars-global_vars
@@ -2506,15 +2507,18 @@ def visit_FunctionDef(self, node):
 					usertype = None
 					if '=' in v:
 						t,n = v.split('=')  ## unpack type and name
+						if self._with_dart and t in typedpython.simd_types:
+							t = t[0].upper() + t[1:]
 						v = '%s=%s' %(n,t)  ## reverse
+						local_typedef_names.add( n )
 						if t == 'long':
 							writer.write('''inline("if (__NODEJS__==true) var long = require('long')")''')  ## this is ugly
 
 						if n in args:
 							args_typedefs.append( v )
 						else:
 							local_typedefs.append( v )
-					elif v in args: pass
+					elif v in args or v in local_typedef_names: pass
 					else: vars.append( v )
 
 				if args_typedefs:
diff --git a/pythonjs/pythonjs.py b/pythonjs/pythonjs.py
@@ -403,7 +403,7 @@ def _visit_call_helper_var(self, node):
 		if args:
 			out.append( 'var ' + ','.join(args) )
 		if node.keywords:
-			out.append( 'var ' + ','.join([key.value.id for key in node.keywords]) )
+			out.append( 'var ' + ','.join([key.arg for key in node.keywords]) )
 
 		return ';'.join(out)
 
diff --git a/pythonjs/pythonjs_to_dart.py b/pythonjs/pythonjs_to_dart.py
@@ -471,7 +471,7 @@ def _visit_call_helper_var(self, node):
 			out.append( 'var ' + ','.join(args) )
 		if node.keywords:
 			for key in node.keywords:
-				out.append( '%s %s' %(key.arg, key.value.id) )
+				out.append( '%s %s' %(key.value.id, key.arg) )
 
 		return ';'.join(out)
 
diff --git a/pythonjs/runtime/dart_builtins.py b/pythonjs/runtime/dart_builtins.py
@@ -3,6 +3,7 @@
 # License: "New BSD"
 
 dart_import('dart:collection')
+dart_import('dart:typed_data')
 dart_import('dart:math', 'Math')
 
 #@dart.extends
diff --git a/pythonjs/typedpython.py b/pythonjs/typedpython.py
@@ -1,10 +1,13 @@
 whitespace = [' ', '\t']
 native_number_types = ['int', 'float', 'double']  ## float and double are the same
+simd_types = ['float32x4', 'int32x4']
+vector_types = simd_types  ## TODO support non-simd vec types like vec3f?
 number_types = ['long']  ## requires https://github.com/dcodeIO/Long.js
 number_types.extend( native_number_types )
 
 types = ['str', 'list', 'dict']
 types.extend( number_types)
+types.extend( vector_types )
 
 
 def transform_source( source, strip=False ):
