support while/else syntax.

hartsantler · hartsantler · commit bda74eebdffc · 2014-06-10T02:34:16.000-07:00
diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
@@ -2901,6 +2901,7 @@ def visit_Continue(self, node):
 		return ''
 
 	def visit_Break(self, node):
+		writer.write('__break__ = True')
 		writer.write('break')
 
 	def visit_For(self, node):
@@ -3131,27 +3132,34 @@ def visit_For(self, node):
 
 	_call_ids = 0
 	def visit_While(self, node):
-		log('while loop:')
 		if self._cache_while_body_calls:  ## TODO add option for this
 			for n in node.body:
 				calls = collect_calls(n)
 				for c in calls:
-					log('--call: %s' %c)
-					log('------: %s' %c.func)
 					if isinstance(c.func, ast.Name):  ## these are constant for sure
 						i = self._call_ids
 						writer.write( '__call__%s = __get__(%s,"__call__")' %(i,self.visit(c.func)) )
 						c.func.id = '__call__%s'%i
 						c.constant = True
 						self._call_ids += 1
 
+		if node.orelse:
+			writer.write('var(__break__)')
+			writer.write('__break__ = False')
+
 		self._in_while_test = True
 		writer.write('while %s:' % self.visit(node.test))
 		self._in_while_test = False
 		writer.push()
 		map(self.visit, node.body)
 		writer.pull()
 
+		if node.orelse:
+			writer.write('if __break__ == False:')
+			writer.push()
+			map(self.visit, node.orelse)
+			writer.pull()
+
 	def visit_With(self, node):
 		global writer
 
diff --git a/regtests/loop/while_else.py b/regtests/loop/while_else.py
@@ -0,0 +1,25 @@
+'''
+while else loop
+'''
+
+def main():
+
+	a = False
+	i = 0
+	while i < 10:
+		i += 1
+	else:
+		a = True
+
+	TestError( a==True )
+
+	b = False
+	i = 0
+	while i < 10:
+		i += 1
+		break
+	else:
+		b = True
+
+	TestError( b==False )
+
