fix breaking out of for..in loop inside a switch (case 489680)

Author: bamboo

src/UnityScript.Tests/DuckyIntegrationTestFixture.boo

@@ -358,6 +358,10 @@ class DuckyIntegrationTestFixture(AbstractIntegrationTestFixture):
 		RunTestCase("tests/integration/for-continue-2.js")
 
 
+	[Test] def for_in_switch_break():
+		RunTestCase("tests/integration/for-in-switch-break.js")
+		
+	
 	[Test] def for_over_null():
 		RunTestCase("tests/integration/for-over-null.js")
 
@@ -628,6 +632,8 @@ class DuckyIntegrationTestFixture(AbstractIntegrationTestFixture):
 
 	[Test] def yield_null():
 		RunTestCase("tests/integration/yield-null.js")
+		
+	
 	[Test] def Array_cast_to_native_array_of_struct():
 		RunTestCase("tests/ducky/Array-cast-to-native-array-of-struct.js")
 

src/UnityScript.Tests/StrictIntegrationTestFixture.Generated.boo

@@ -356,6 +356,10 @@ partial class StrictIntegrationTestFixture(AbstractIntegrationTestFixture):
 		RunTestCase("tests/integration/for-continue-2.js")
 
 
+	[Test] def for_in_switch_break():
+		RunTestCase("tests/integration/for-in-switch-break.js")
+		
+	
 	[Test] def for_over_null():
 		RunTestCase("tests/integration/for-over-null.js")
 

src/UnityScript/Macros/SwitchMacro.boo

@@ -96,8 +96,14 @@ class GotoOnTopLevelBreak(DepthFirstTransformer):
 		ReplaceCurrentNode(NewGoto(_label))
 
 	override def OnWhileStatement(node as WhileStatement):
+		OnLoopBody node.Block
+		
+	override def OnForStatement(node as ForStatement):
+		OnLoopBody node.Block
+		
+	def OnLoopBody(block as Block):
 		++_level
-		node.Block.Accept(self)
+		block.Accept(self)
 		--_level
 
 def NewGoto(label as LabelStatement):

tests/integration/for-in-switch-break.js

@@ -0,0 +1,41 @@
+/*
+5
+4
+3
+2
+JS for: Boom
+5
+4
+3
+2
+JS for in: Boom
+*/
+function Start() {
+	for (var a=1; a<=2; ++a) {
+		switch (a) {
+			case 1:
+				for (var b=5; b>0; b--) {
+					print(b);
+					if (b == 2) {
+						break;
+					}
+				}
+				print("JS for: Boom");
+				break;
+			
+			case 2:
+				var ts : int[] = [5,4,3,2,1,0];
+				for (var t in ts) {
+					print(t);
+					if (t == 2) {
+						break;
+					}
+				}
+				print("JS for in: Boom");
+				break;
+		}
+	}
+}
+
+Start();
+