dart backend: added function calls with keyword defaults

hartsantler · hartsantler · commit eeb20b80bd44 · 2014-01-26T08:19:01.000-08:00
diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
@@ -1574,7 +1574,8 @@ def visit_Call(self, node):
 
 			if name in self._generator_functions:
 				return ' new %s(%s)' %(name, ','.join(args))
-			if self._with_dart and name in self._builtin_functions_dart:
+
+			elif self._with_dart and name in self._builtin_functions_dart:
 				if args:
 					return self._builtin_functions_dart[name] % ','.join(args)
 				else:
@@ -1615,11 +1616,13 @@ def visit_Call(self, node):
 
 				else:
 					a = ','.join(args)
-					return '%s(%s)' %( self.visit(node.func), a )
+					if node.keywords:
+						args.extend( [self.visit(x.value) for x in node.keywords] )
+						return '%s(%s)' %( self.visit(node.func), ','.join(args) )
+
+					else:
+						return '%s(%s)' %( self.visit(node.func), ','.join(args) )
 
-			#elif isinstance(node.func, Name) and node.func.id == 'JS':  ## avoids nested JS
-			#	assert len(args) == 1
-			#	return node.args[0].s  ## string literal
 
 			elif isinstance(node.func, Name) and node.func.id in self._js_classes:
 				a = ','.join(args)
@@ -1628,9 +1631,29 @@ def visit_Call(self, node):
 			elif name in self._global_functions and self._with_inline:
 				return self.inline_function( node )
 
-			else:
-				a = ','.join(args)
-				return '%s(%s)' %( self.visit(node.func), a )
+			elif self._with_dart:  ## DART
+				args
+				if node.keywords:
+					kwargs = ','.join( ['%s:%s'%(x.arg, self.visit(x.value)) for x in node.keywords] )
+					if args:
+						return '%s(%s, JS("%s"))' %( self.visit(node.func), ','.join(args), kwargs )
+					else:
+						return '%s( JS("%s"))' %( self.visit(node.func), kwargs )
+
+				else:
+					a = ','.join(args)
+					return '%s(%s)' %( self.visit(node.func), a )
+
+			else:  ## javascript mode
+				if node.keywords:
+					args.extend( [self.visit(x.value) for x in node.keywords] )
+					return '%s(%s)' %( self.visit(node.func), ','.join(args) )
+
+				else:
+					return '%s(%s)' %( self.visit(node.func), ','.join(args) )
+
+				#a = ','.join(args)
+				#return '%s(%s)' %( self.visit(node.func), a )
 
 		elif isinstance(node.func, Name) and node.func.id in self._generator_functions:
 			name = self.visit(node.func)
diff --git a/pythonjs/pythonjs_to_dart.py b/pythonjs/pythonjs_to_dart.py
@@ -30,6 +30,7 @@ def collect_names(node):
 class DartGenerator( pythonjs.JSGenerator ):
 	_classes = dict()
 	_class_props = dict()
+	_raw_dict = False
 
 	def _visit_subscript_ellipsis(self, node):
 		name = self.visit(node.value)
@@ -45,7 +46,10 @@ def visit_Dict(self, node):
 			v = self.visit( node.values[i] )
 			a.append( '%s:%s'%(k,v) )
 		b = ','.join( a )
-		return 'new dict( {%s} )' %b
+		if self._raw_dict:
+			return '{%s}' %b
+		else:
+			return 'new dict( {%s} )' %b
 
 	def visit_ClassDef(self, node):
 		node._parents = set()
@@ -312,12 +316,13 @@ def _visit_function(self, node):
 			dindex = i - offset
 			if dindex >= 0 and node.args.defaults:
 				default_value = self.visit( node.args.defaults[dindex] )
-				oargs.append( '%s=%s' %(a, default_value) )
+				oargs.append( '%s:%s' %(a, default_value) )
 			else:
 				args.append( a )
 
 		if oargs:
-			args.append( '[%s]' % ','.join(oargs) )
+			#args.append( '[%s]' % ','.join(oargs) )
+			args.append( '{%s}' % ','.join(oargs) )
 
 		buffer = self.indent()
 		if hasattr(node,'_prefix'): buffer += node._prefix + ' '
diff --git a/regtests/calling/args.py b/regtests/calling/args.py
@@ -0,0 +1,7 @@
+"""simple function call"""
+def f(a, b, c):
+	return a+b+c
+
+def main():
+	TestError( f(1,2,3) == 6)
+
diff --git a/regtests/calling/keyword.py b/regtests/calling/keyword.py
@@ -0,0 +1,8 @@
+"""keywords"""
+def f(a, b=None, c=None):
+	return (a+b) * c
+
+def main():
+	TestError( f(1, b=2, c=3) == 9)  ## inorder works in javascript mode
+	TestError( f(1, c=3, b=2) == 9)  ## out of order fails in javascript mode
+
