go backend: for x in array loops

hartsantler · hartsantler · commit 1fa814487a7a · 2014-08-08T05:10:49.000-07:00
diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
@@ -3350,7 +3350,7 @@ def visit_For(self, node):
 						c.constant = True
 						self._call_ids += 1
 
-		if self._with_glsl:
+		if self._with_glsl or self._with_go:
 			writer.write( 'for %s in %s:' %(self.visit(node.target), self.visit(node.iter)) )
 			writer.push()
 			map(self.visit, node.body)
diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
@@ -70,6 +70,33 @@ def visit_Compare(self, node):
 
 		return ' '.join( comp )
 
+	def visit_For(self, node):
+		target = self.visit(node.target)
+		lines = []
+		if isinstance(node.iter, ast.Call) and isinstance(node.iter.func, ast.Name):
+			iter = self.visit(node.iter.args[0])
+
+			if node.iter.func.id == 'range':
+				lines.append('for _,%s := range %s {' %(target, iter))
+			elif node.iter.func.id == 'enumerate':
+				lines.append('for %s,%s := range %s {')
+
+			else:
+				raise SyntaxError('invalid for loop - bad iterator')
+
+
+		else:
+			iter = self.visit( node.iter )
+			lines.append('for _,%s := range %s {' %(target, iter))
+
+		self.push()
+		for b in node.body:
+			lines.append( self.indent()+self.visit(b) )
+		self.pull()
+		lines.append( self.indent()+'}' )  ## end of for loop
+		return '\n'.join(lines)
+
+
 	def _visit_call_helper_go(self, node):
 		name = self.visit(node.func)
 		if name == '__go__':
diff --git a/regtests/go/loop_arrays.py b/regtests/go/loop_arrays.py
@@ -0,0 +1,23 @@
+'''
+array loop
+'''
+
+def main():
+
+	a = [1,2,3]
+	y = 0
+	for x in a:
+		y += x
+	TestError( y==6 )
+
+	z = ''
+	arr = ['a', 'b', 'c']
+	for v in arr:
+		z += v
+	TestError( z == 'abc' )
+
+	#b = False
+	#if 'a' in arr:
+	#	b = True
+	#TestError( b == True )
+
