go backend: auto detect map type by looking at keys and values in a dict literal.

hartsantler · hartsantler · commit 0fc2d923e72a · 2014-08-08T20:33:31.000-07:00
diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
@@ -1778,6 +1778,37 @@ def _visit_assign_helper(self, node, target):
 		if isinstance(node.value, ast.Lambda):
 			self.visit(node.value)  ## writes function def
 			writer.write('%s = __lambda__' %self.visit(target))
+
+		elif isinstance(node.value, ast.Dict) and self._with_go:
+			key_type = None
+			val_type = None
+
+			for i in range( len(node.value.keys) ):
+				k = node.value.keys[ i ]
+				v = node.value.values[i]
+				if isinstance(k, ast.Str):
+					key_type = 'string'
+				elif isinstance(k, ast.Num):
+					key_type = 'int'
+
+				if isinstance(v, ast.Str):
+					val_type = 'string'
+				elif isinstance(v, ast.Num):
+					if isinstance(v.n, int):
+						val_type = 'int'
+					else:
+						val_type = 'float64'
+
+			if not key_type:
+				raise SyntaxError(  self.format_error('can not determine dict key type')  )
+			if not val_type:
+				raise SyntaxError(  self.format_error('can not determine dict value type')  )
+
+			t = self.visit(target)
+			v = self.visit(node.value)
+			writer.write('%s = __go__map__(%s, %s) << %s' %(t, key_type, val_type, v))
+
+
 		elif isinstance(node.value, ast.List) and self._with_go:
 			guess_type = None
 			for elt in node.value.elts:
diff --git a/regtests/go/loop_arrays.py b/regtests/go/loop_arrays.py
@@ -16,11 +16,6 @@ def main():
 		z += v
 	TestError( z == 'abc' )
 
-	#b = False
-	#if 'a' in arr:
-	#	b = True
-	#TestError( b == True )
-
 	b = 0
 	for i in range(10):
 		b += 1
@@ -32,3 +27,8 @@ def main():
 		c += v
 		d += i
 	TestError( c == 'abc' )
+
+	e = 0
+	for i in range( len(arr) ):
+		e += 1
+	TestError( e == 3 )
diff --git a/regtests/go/maps.py b/regtests/go/maps.py
@@ -7,8 +7,18 @@ def main():
 		'z': 3,
 	}
 
-	print( a['x'] )
+	#print( a['x'] )
+	TestError( a['x']==1 )
 
 	b = map[int]string{ 0:'a', 1:'b' }
-	print( b[0] )
-	print( b[1] )
+	#print( b[0] )
+	#print( b[1] )
+	TestError( b[0]=='a' )
+	TestError( b[1]=='b' )
+
+	c = {'x':100, 'y':200}
+	#print( c['x'] )
+	#print( c['y'] )
+
+	TestError( c['x']==100 )
+	TestError( c['y']==200 )
