BL-747 Correctly detect switch vs forindex

ortus-boxlang · Nov 15, 2024 · 5bd1fff · 5bd1fff
1 parent 0c27701
commit 5bd1fff
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/...n/java/ortus/boxlang/compiler/javaboxpiler/transformer/statement/BoxBreakTransformer.java b/...n/java/ortus/boxlang/compiler/javaboxpiler/transformer/statement/BoxBreakTransformer.java
@@ -20,6 +20,11 @@
 
 import ortus.boxlang.compiler.ast.BoxNode;
 import ortus.boxlang.compiler.ast.statement.BoxBreak;
+import ortus.boxlang.compiler.ast.statement.BoxDo;
+import ortus.boxlang.compiler.ast.statement.BoxForIn;
+import ortus.boxlang.compiler.ast.statement.BoxForIndex;
+import ortus.boxlang.compiler.ast.statement.BoxSwitch;
+import ortus.boxlang.compiler.ast.statement.BoxWhile;
 import ortus.boxlang.compiler.javaboxpiler.JavaTranspiler;
 import ortus.boxlang.compiler.javaboxpiler.transformer.AbstractTransformer;
 import ortus.boxlang.compiler.javaboxpiler.transformer.TransformerContext;
@@ -45,9 +50,11 @@ public Node transform( BoxNode node, TransformerContext context ) throws Illegal
 		if ( exitsAllowed.equals( ExitsAllowed.COMPONENT ) ) {
 			template = "if(true) return Component.BodyResult.ofBreak(" + componentLabel + ");";
 		} else if ( exitsAllowed.equals( ExitsAllowed.LOOP ) ) {
+			@SuppressWarnings( "unchecked" )
+			BoxNode	specificExit		= node.getFirstNodeOfTypes( BoxDo.class, BoxForIndex.class, BoxForIn.class, BoxSwitch.class, BoxWhile.class );
 			String	breakDetectionName	= null;
 			Integer	breakCounter		= transpiler.peekForLoopBreakCounter();
-			if ( breakCounter != null ) {
+			if ( specificExit instanceof BoxForIndex && breakCounter != null ) {
 				breakDetectionName	= "didBreak" + breakCounter;
 				template			= "if(true) { " + breakDetectionName + "=true; break " + breakLabel + "; }";
 			} else {

diff --git a/src/test/java/TestCases/phase1/CoreLangTest.java b/src/test/java/TestCases/phase1/CoreLangTest.java
@@ -755,6 +755,26 @@ public void testSentinelIncrementDoesNotRunAfterBreak() {
 		assertThat( variables.get( Key.of( "i" ) ) ).isEqualTo( 0 );
 	}
 
+	@DisplayName( "sentinel with switch that uses break" )
+	@Test
+	public void testSentinelWithSwitchThatUsesBreak() {
+
+		instance.executeSource(
+		    """
+		    safety = 0;
+		       for( i=0; i<5; i++ ) {
+		    	safety++;
+		    	assert safety < 100;
+		       	switch( "brad" ) {
+		       		case "brad":
+		       			break;
+		       	}
+		       }
+		    """,
+		    context );
+		assertThat( variables.get( Key.of( "i" ) ) ).isEqualTo( 5 );
+	}
+
 	@DisplayName( "nested sentinel break" )
 	@Test
 	public void testNestedSentinelBreak() {