eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-22 08:14:09 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix issues in break elimination

Browse Source
This commit is contained in:
Alexey Andreev 2015-04-17 22:52:02 +03:00
parent b3f662327c
commit eb48c349d0
2 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
teavm-core/src/main/java/org/teavm/javascript/BreakEliminator.java
View File

@ -161,6 +161,6 @@ class BreakEliminator implements StatementVisitor {
} }
private boolean escapes(List<Statement> statements) { private boolean escapes(List<Statement> statements) {
return new EscapingStatementFinder(outerStatements).check(statements); return new EscapingStatementFinder().check(statements);
} }
} }

51
teavm-core/src/main/java/org/teavm/javascript/EscapingStatementFinder.java
View File

@ -15,6 +15,7 @@
*/ */
package org.teavm.javascript; package org.teavm.javascript;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import org.teavm.javascript.ast.*; import org.teavm.javascript.ast.*;
@ -23,28 +24,38 @@ import org.teavm.javascript.ast.*;
* *
* @author Alexey Andreev * @author Alexey Andreev
*/ */
class EscapingStatementFinder implements StatementVisitor{ class EscapingStatementFinder implements StatementVisitor {
public boolean escaping; public boolean escaping;
private Set<IdentifiedStatement> outerStatements; private boolean last = true;
private Set<IdentifiedStatement> outerStatements = new HashSet<>();
public EscapingStatementFinder(Set<IdentifiedStatement> nestingStatements) {
this.outerStatements = nestingStatements;
}
public boolean check(List<Statement> statements) { public boolean check(List<Statement> statements) {
if (!escaping) { if (escaping) {
if (statements.isEmpty()) { return true;
escaping = true; }
} else { if (statements.isEmpty()) {
statements.get(statements.size() - 1).acceptVisitor(this); escaping = last;
return true;
}
boolean oldLast = last;
for (int i = 0; i < statements.size(); ++i) {
last = false;
statements.get(i).acceptVisitor(this);
if (escaping) {
break;
} }
} }
last = oldLast;
if (!escaping) {
statements.get(statements.size() - 1).acceptVisitor(this);
}
last = oldLast;
return escaping; return escaping;
} }
@Override @Override
public void visit(AssignmentStatement statement) { public void visit(AssignmentStatement statement) {
escaping = true; escaping |= last;
} }
@Override @Override
@ -73,7 +84,11 @@ class EscapingStatementFinder implements StatementVisitor{
@Override @Override
public void visit(WhileStatement statement) { public void visit(WhileStatement statement) {
escaping = true; outerStatements.add(statement);
if (!check(statement.getBody()) && statement.getCondition() != null) {
escaping |= last;
}
outerStatements.remove(statement);
} }
@Override @Override
@ -85,12 +100,12 @@ class EscapingStatementFinder implements StatementVisitor{
@Override @Override
public void visit(BreakStatement statement) { public void visit(BreakStatement statement) {
escaping = !outerStatements.contains(statement.getTarget()); escaping |= !outerStatements.contains(statement.getTarget());
} }
@Override @Override
public void visit(ContinueStatement statement) { public void visit(ContinueStatement statement) {
escaping = !outerStatements.contains(statement.getTarget()); escaping |= !outerStatements.contains(statement.getTarget());
} }
@Override @Override
@ -103,7 +118,7 @@ class EscapingStatementFinder implements StatementVisitor{
@Override @Override
public void visit(InitClassStatement statement) { public void visit(InitClassStatement statement) {
escaping = true; escaping |= last;
} }
@Override @Override
@ -118,11 +133,11 @@ class EscapingStatementFinder implements StatementVisitor{
@Override @Override
public void visit(MonitorEnterStatement statement) { public void visit(MonitorEnterStatement statement) {
escaping = true; escaping |= last;
} }
@Override @Override
public void visit(MonitorExitStatement statement) { public void visit(MonitorExitStatement statement) {
escaping = true; escaping |= last;
} }
} }