go backend: support go.make

hartsantler · hartsantler · commit 2dd323501d37 · 2014-09-11T02:56:27.000-07:00
diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
@@ -299,10 +299,10 @@ def __init__(self, source=None, module=None, module_path=None, dart=False, coffe
 				self._source = source.splitlines()
 
 
-		if '--debug' in sys.argv:
+		if '--debug--' in sys.argv:
 			try:
 				tree = ast.parse( source )
-			except:
+			except SyntaxError:
 				raise SyntaxError(source)
 		else:
 			tree = ast.parse( source )
diff --git a/pythonjs/pythonjs.py b/pythonjs/pythonjs.py
@@ -962,6 +962,7 @@ def visit_BinOp(self, node):
 				if node.left.func.id == '__go__map__':
 					key_type = self.visit(node.left.args[0])
 					value_type = self.visit(node.left.args[1])
+					if value_type == 'interface': value_type = 'interface{}'
 					return 'map[%s]%s%s' %(key_type, value_type, right)
 				else:
 					if not right.startswith('{') and not right.endswith('}'):
@@ -973,6 +974,8 @@ def visit_BinOp(self, node):
 						asize = self.visit(node.left.args[0])
 						atype = self.visit(node.left.args[1])
 						return '[%s]%s%s' %(asize, atype, right)
+			elif isinstance(node.left, ast.Name) and node.left.id=='__go__array__' and op == '<<':
+				return '[]%s' %self.visit(node.right)
 
 		if left in self._typed_vars and self._typed_vars[left] == 'numpy.float32':
 			left += '[_id_]'
diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
@@ -21,6 +21,8 @@ def __init__(self, requirejs=False, insert_runtime=False):
 		self._known_vars = set()
 		self._kwargs_type_ = dict()
 
+		self._imports = []
+
 	def visit_ClassDef(self, node):
 		self._class_stack.append( node )
 		node._parents = set()
@@ -152,9 +154,9 @@ def visit_Expr(self, node):
 	def visit_Import(self, node):
 		r = [alias.name.replace('__SLASH__', '/') for alias in node.names]
 		if r:
-			return 'import("%s")' %';'.join(r)
-		else:
-			return ''
+			for name in r:
+				self._imports.append('import("%s");' %name)
+		return ''
 
 	def visit_Module(self, node):
 		header = [
@@ -173,7 +175,10 @@ def visit_Module(self, node):
 					else:
 						lines.append( sub )
 			else:
-				raise SyntaxError(b)
+				if isinstance(b, ast.Import):
+					pass
+				else:
+					raise SyntaxError(b)
 
 		lines.append('type _kwargs_type_ struct {')
 		for name in self._kwargs_type_:
@@ -182,7 +187,7 @@ def visit_Module(self, node):
 			lines.append( '  __use__%s bool' %name)
 		lines.append('}')
 
-		lines = header + lines
+		lines = header + self._imports + lines
 		return '\n'.join( lines )
 
 
@@ -269,12 +274,17 @@ def _visit_call_helper_go(self, node):
 		name = self.visit(node.func)
 		if name == '__go__':
 			return 'go %s' %self.visit(node.args[0])
-		elif name == '__gomake__':
+		elif name == '__go_make__':
 			return 'make(%s)' %self.visit(node.args[0])
 		elif name == '__go_make_chan__':
 			return 'make(chan %s)' %self.visit(node.args[0])
 		elif name == '__go__array__':
-			return '[]%s{}' %self.visit(node.args[0])
+			if isinstance(node.args[0], ast.BinOp):# and node.args[0].op == '<<':  ## todo assert right is `typedef`
+				a = self.visit(node.args[0].left)
+				return '[]%s' %a
+			else:
+				a = self.visit(node.args[0])
+				return '[]%s{}' %a
 		else:
 			raise SyntaxError(name)
 
@@ -507,7 +517,7 @@ def main(script, insert_runtime=True):
 		script = runtime + '\n' + script
 
 	tree = ast.parse(script)
-	#return GoGenerator().visit(tree)
+	return GoGenerator().visit(tree)
 	try:
 		return GoGenerator().visit(tree)
 	except SyntaxError as err:
diff --git a/pythonjs/typedpython.py b/pythonjs/typedpython.py
@@ -24,7 +24,8 @@
 GO_SPECIAL_CALLS = {
 	'go'         : '__go__',
 	'go.channel' : '__go_make_chan__',
-	'go.array'   : '__go__array__'
+	'go.array'   : '__go__array__',
+	'go.make'    : '__go_make__'
 }
 
 def transform_source( source, strip=False ):
@@ -73,7 +74,8 @@ def transform_source( source, strip=False ):
 				a.append(')<<{')
 				hit_go_typedef = False
 			elif hit_go_typedef and char==',':
-				a.append('),')
+				#a.append(', type=True),')  ## this breaks function annotations that splits on ','
+				a.append('<<typedef),')
 				hit_go_typedef = False
 
 
@@ -270,12 +272,9 @@ def transform_source( source, strip=False ):
 			tailend = tail[ tail.rindex(')')+1 : ]
 			tail = tail[ : tail.rindex(')') ]
 
-			#print(head)
-			#print(tail)
-			#raise RuntimeError
 
 			for x in tail.split(','):
-				y = x #x.split(')')[0]
+				y = x
 				if ':' in y:
 					kw = None
 					if '=' in y:
@@ -446,6 +445,9 @@ def f(*args:int, **kwargs:int) ->int:
 
 y = go.make([]float64, 1000)
 
+def plot(id:string, latency:[]float64, xlabel:string, title:string ):
+	pass
+
 '''
 
 if __name__ == '__main__':
