go backend: support function calls with variable arguments def f(*args)

hartsantler · hartsantler · commit 2e09cd7433d1 · 2014-08-10T19:21:57.000-07:00
diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
@@ -2276,6 +2276,8 @@ def visit_Call(self, node):
 			args = list( map(self.visit, node.args) )
 			if node.keywords:
 				args.extend( ['%s=%s'%(x.arg,self.visit(x.value)) for x in node.keywords] )
+			if node.starargs:
+				args.append('*%s' %self.visit(node.starargs))
 			return '%s(%s)' %( self.visit(node.func), ','.join(args) )
 
 		elif self._with_js or self._with_dart:
@@ -2931,10 +2933,6 @@ def visit_FunctionDef(self, node):
 
 		elif self._with_go:
 
-			if node.args.vararg:
-				raise SyntaxError( 'TODO go backend, variable arguments (*args)' )
-
-
 			args = []
 			offset = len(node.args.args) - len(node.args.defaults)
 			for i, arg in enumerate(node.args.args):
@@ -2946,6 +2944,9 @@ def visit_FunctionDef(self, node):
 				else:
 					args.append( a )
 
+			if node.args.vararg:
+				args.append( '*%s' %node.args.vararg )
+
 			writer.write( 'def %s( %s ):' % (node.name, ','.join(args)) )
 
 
diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
@@ -129,6 +129,10 @@ def _visit_call_helper(self, node):
 			args += ','.join( x )
 			args += '}'
 
+		if node.starargs:
+			if args: args += ','
+			args += '%s...' %self.visit(node.starargs)
+
 		return '%s(%s)' % (fname, args)
 
 	def _visit_call_helper_go(self, node):
@@ -192,6 +196,11 @@ def _visit_function(self, node):
 			#args.append( '{%s}' % ','.join(oargs) )
 			args.append( '__kwargs _kwargs_type_')
 
+		if node.args.vararg:
+			starargs = node.args.vararg
+			assert starargs in args_typedefs
+			args.append( '%s ...%s' %(starargs, args_typedefs[starargs]))
+
 		####
 		out = []
 		if return_type:
diff --git a/pythonjs/typedpython.py b/pythonjs/typedpython.py
@@ -259,10 +259,15 @@ def transform_source( source, strip=False ):
 					chan = False
 					if len(arg.split()) == 2:
 						chan, arg = arg.split()
+					if '*' in arg:
+						arg_name = arg.split('*')[-1]
+					else:
+						arg_name = arg
+
 					if chan:
-						output.append('%s@typedef_chan(%s=%s)' %(indent, arg,typedef))
+						output.append('%s@typedef_chan(%s=%s)' %(indent, arg_name, typedef))
 					else:
-						output.append('%s@typedef(%s=%s)' %(indent, arg,typedef))
+						output.append('%s@typedef(%s=%s)' %(indent, arg_name, typedef))
 					if kw:
 						arg += '=' + kw
 					args.append(arg)
@@ -405,6 +410,9 @@ def f(a:int, b:int, c:int) ->int:
 def f(a:int=100, b:int=100) ->int:
 	return a+b
 
+def f(*args:int, **kwargs:int) ->int:
+	return a+b
+
 '''
 
 if __name__ == '__main__':
diff --git a/regtests/go/func_calls.py b/regtests/go/func_calls.py
@@ -5,9 +5,16 @@ def f(a:int, b:int, c:int) ->int:
 def f2(a:int=1, b:int=2, c:int=3) ->int:
 	return a+b+c
 
+def f3( *args:int ) ->int:
+	return args[0] + args[1] + args[2]
+
 
 def main():
 	TestError( f(1,2,3) == 6)
 
 	x = f2( b=100 )
 	TestError(x==104)
+
+	arr = [1,2,3]
+	y = f3( *arr )
+	TestError( y==6 )
