backup/JWebAssembly
1
0
Fork 0
mirror of https://github.com/i-net-software/JWebAssembly.git synced 2025-03-25 07:27:52 +01:00
Code Issues Projects Releases Activity

fix WHILE loop after a return

Browse Source
This commit is contained in:
Volker Berlin 2022-02-13 13:18:32 +01:00
parent 8eac318ef8
commit 86f95ad3bb
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/de/inetsoftware/jwebassembly/module/BranchManager.java
View File

@ -617,7 +617,7 @@ class BranchManager {
boolean isContinue = false; boolean isContinue = false;
for( int i = ifCount + 1; i < parsedOpCount; i++ ) { for( int i = ifCount + 1; i < parsedOpCount; i++ ) {
ParsedBlock op = parsedOperations.get( i ); ParsedBlock op = parsedOperations.get( i );
if( op.endPosition >= elsePos ) { if( op.endPosition >= elsePos && op.op == JavaBlockOperator.IF ) {
isContinue = true; isContinue = true;
break; break;
} }

17
test/de/inetsoftware/jwebassembly/runtime/ControlFlowOperators.java
View File

@ -54,6 +54,7 @@ public class ControlFlowOperators extends AbstractBaseTest {
addParam( list, script, "whileLoopInElse_3" ); addParam( list, script, "whileLoopInElse_3" );
addParam( list, script, "whileLoopInElse_13" ); addParam( list, script, "whileLoopInElse_13" );
addParam( list, script, "whileLoopInElseAfterReturn" ); addParam( list, script, "whileLoopInElseAfterReturn" );
addParam( list, script, "whileLoopAfterIfWithReturn" );
addParam( list, script, "forLoop" ); addParam( list, script, "forLoop" );
addParam( list, script, "conditionalOperator" ); addParam( list, script, "conditionalOperator" );
addParam( list, script, "conditionalOperator2" ); addParam( list, script, "conditionalOperator2" );
@ -392,6 +393,22 @@ public class ControlFlowOperators extends AbstractBaseTest {
return result; return result;
} }
@Export
public static int whileLoopAfterIfWithReturn() {
int yIndex = 13;
int result = 0;
if (yIndex < 3) {
if( yIndex == 3 ) {
return 42;
}
while (yIndex > 7) {
result++;
yIndex--;
}
}
return result;
}
@Export @Export
static int forLoop() { static int forLoop() {
int a = 0; int a = 0;