go backend: multidimensional array [][]

hartsantler · hartsantler · commit d9f143f8d2d3 · 2014-09-10T17:42:14.000-07:00
diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
@@ -424,7 +424,9 @@ def visit_Import(self, node):
 		tornado = ['tornado', 'tornado.web', 'tornado.ioloop']
 
 		for alias in node.names:
-			if alias.name in tornado:
+			if self._with_go:
+				writer.write('import %s' %alias.name)
+			elif alias.name in tornado:
 				pass  ## pythonjs/fakelibs/tornado.py
 			elif alias.name == 'tempfile':
 				pass  ## pythonjs/fakelibs/tempfile.py
diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
@@ -150,9 +150,9 @@ def visit_Expr(self, node):
 		return self.visit(node.value)
 
 	def visit_Import(self, node):
-		r = [alias.name for alias in node.names]
+		r = [alias.name.replace('__SLASH__', '/') for alias in node.names]
 		if r:
-			return 'import "%s"' %';'.join(r)
+			return 'import("%s")' %';'.join(r)
 		else:
 			return ''
 
diff --git a/pythonjs/typedpython.py b/pythonjs/typedpython.py
@@ -44,7 +44,7 @@ def transform_source( source, strip=False ):
 				if nextchar.strip(): break
 				j += 1
 
-			if a and char==']' and j==i+1 and nextchar!=None and nextchar in 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ':
+			if a and char==']' and j==i+1 and nextchar!=None and nextchar in '[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ':
 				assert '[' in a
 				gotype = []
 				b = a.pop()
@@ -54,7 +54,10 @@ def transform_source( source, strip=False ):
 				gotype.reverse()
 				gotype = ''.join(gotype)
 				if not gotype:
-					a.append('__go__array__(')
+					if nextchar=='[':
+						a.append('__go__array__<<')
+					else:
+						a.append('__go__array__(')
 				elif gotype.isdigit():
 					a.append('__go__arrayfixed__(%s,' %gotype)
 				else:
@@ -69,6 +72,10 @@ def transform_source( source, strip=False ):
 			elif hit_go_typedef and char=='{':
 				a.append(')<<{')
 				hit_go_typedef = False
+			elif hit_go_typedef and char==',':
+				a.append('),')
+				hit_go_typedef = False
+
 
 			elif a and char in __whitespace:
 				b = ''.join(a)
@@ -153,8 +160,15 @@ def transform_source( source, strip=False ):
 					break
 			indent = ''.join(indent)
 			output.append( indent + '@returns(%s)' %rtype)
-		elif c.startswith('import ') and '-' in c:
-			c = c.replace('-', '__DASH__')
+
+		if c.startswith('import '):
+			if '-' in c:
+				c = c.replace('-', '__DASH__')
+			if '/' in c:
+				c = c.replace('/', '__SLASH__')
+			if '"' in c:
+				c = c.replace('"', '')
+
 
 		if ' new ' in c:
 			c = c.replace(' new ', ' __new__>>')
@@ -430,6 +444,8 @@ def f(*args:int, **kwargs:int) ->int:
 
 a = []int(x for x in range(3))
 
+y = go.make([]float64, 1000)
+
 '''
 
 if __name__ == '__main__':
