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 IF construct with conditional operator inside THEN.

Browse Source
This commit is contained in:
Volker Berlin 2021-05-16 18:44:23 +02:00
parent 712ce90393
commit 4e9e5ca069
2 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/de/inetsoftware/jwebassembly/module/BranchManger.java
View File

@ -1,5 +1,5 @@
/* /*
Copyright 2018 - 2020 Volker Berlin (i-net software) Copyright 2018 - 2021 Volker Berlin (i-net software)
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -32,7 +32,6 @@ import de.inetsoftware.classparser.CodeInputStream;
import de.inetsoftware.classparser.ConstantClass; import de.inetsoftware.classparser.ConstantClass;
import de.inetsoftware.classparser.TryCatchFinally; import de.inetsoftware.classparser.TryCatchFinally;
import de.inetsoftware.jwebassembly.WasmException; import de.inetsoftware.jwebassembly.WasmException;
import de.inetsoftware.jwebassembly.module.TypeManager.BlockType;
import de.inetsoftware.jwebassembly.module.TypeManager.StructType; import de.inetsoftware.jwebassembly.module.TypeManager.StructType;
import de.inetsoftware.jwebassembly.module.WasmInstruction.Type; import de.inetsoftware.jwebassembly.module.WasmInstruction.Type;
import de.inetsoftware.jwebassembly.wasm.AnyType; import de.inetsoftware.jwebassembly.wasm.AnyType;
@ -434,16 +433,32 @@ class BranchManger {
* @return the calculated positions * @return the calculated positions
*/ */
private IfPositions searchElsePosition( IfParsedBlock startBlock, List<ParsedBlock> parsedOperations ) { private IfPositions searchElsePosition( IfParsedBlock startBlock, List<ParsedBlock> parsedOperations ) {
int parsedOpCount = parsedOperations.size();
// find the end position of the else block // find the end position of the else block
int endElse = startBlock.endPosition; int endElse = startBlock.endPosition;
int parsedOpCount = parsedOperations.size(); boolean newElsePositionFound = true;
LOOP:
for( int i = 0; i < parsedOpCount; i++ ) { for( int i = 0; i < parsedOpCount; i++ ) {
ParsedBlock parsedBlock = parsedOperations.get( i ); ParsedBlock parsedBlock;
if( newElsePositionFound ) {
newElsePositionFound = false;
for( int j = i; j < parsedOpCount; j++ ) {
parsedBlock = parsedOperations.get( j );
if( parsedBlock.op == JavaBlockOperator.GOTO ) {
if( parsedBlock.nextPosition == endElse ) {
break LOOP;
}
}
}
}
parsedBlock = parsedOperations.get( i );
switch( parsedBlock.op ) { switch( parsedBlock.op ) {
case IF: case IF:
case GOTO: case GOTO:
if( parsedBlock.startPosition < endElse ) { if( parsedBlock.startPosition < endElse && endElse < parsedBlock.endPosition ) {
endElse = Math.max( endElse, parsedBlock.endPosition ); endElse = parsedBlock.endPosition;
newElsePositionFound = true;
} }
break; break;
} }

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2018 - 2020 Volker Berlin (i-net software) * Copyright 2018 - 2021 Volker Berlin (i-net software)
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -73,6 +73,7 @@ public class ControlFlowOperators extends AbstractBaseTest {
addParam( list, script, "ifWithoutElseAndLoop" ); addParam( list, script, "ifWithoutElseAndLoop" );
addParam( list, script, "ifOrWithMulti" ); addParam( list, script, "ifOrWithMulti" );
addParam( list, script, "ifMultipleInsideThen" ); addParam( list, script, "ifMultipleInsideThen" );
addParam( list, script, "ifWithConditionalInsideThen" );
addParam( list, script, "stringSwitchNormalFoo" ); addParam( list, script, "stringSwitchNormalFoo" );
addParam( list, script, "stringSwitchNormalBar" ); addParam( list, script, "stringSwitchNormalBar" );
addParam( list, script, "stringSwitchNormalDefault" ); addParam( list, script, "stringSwitchNormalDefault" );
@ -545,6 +546,20 @@ public class ControlFlowOperators extends AbstractBaseTest {
return result; return result;
} }
@Export
static int ifWithConditionalInsideThen() throws CloneNotSupportedException {
int val = 42;
int result = 0;
if( val > 20 ) {
if( val > 21 ) {
result = val == 42 ? 4 : 5;
}
} else {
result = 3;
}
return result + 13;
}
@Export @Export
static int stringSwitchNormalFoo() { static int stringSwitchNormalFoo() {
return stringSwitchNormal( "foo" ); return stringSwitchNormal( "foo" );