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

Use $$ prefix for exception handling variables, since $ used for local variables

Browse Source
This commit is contained in:
Alexey Andreev 2016-12-04 20:52:57 +03:00
parent 973231752f
commit 730d3f3070
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/org/teavm/backend/javascript/rendering/Renderer.java
View File

@ -678,7 +678,7 @@ public class Renderer implements RenderingManager {
variableNames.add(statementRenderer.variableName(i)); variableNames.add(statementRenderer.variableName(i));
} }
if (hasTryCatch) { if (hasTryCatch) {
variableNames.add("$je"); variableNames.add("$$je");
} }
if (!variableNames.isEmpty()) { if (!variableNames.isEmpty()) {
writer.append("var "); writer.append("var ");
@ -725,7 +725,7 @@ public class Renderer implements RenderingManager {
} }
boolean hasTryCatch = tryCatchFinder.tryCatchFound; boolean hasTryCatch = tryCatchFinder.tryCatchFound;
if (hasTryCatch) { if (hasTryCatch) {
variableNames.add("$je"); variableNames.add("$$je");
} }
variableNames.add(context.pointerName()); variableNames.add(context.pointerName());
variableNames.add(context.tempVarName()); variableNames.add(context.tempVarName());

12
core/src/main/java/org/teavm/backend/javascript/rendering/StatementRenderer.java
View File

@ -1355,25 +1355,25 @@ public class StatementRenderer implements ExprVisitor, StatementVisitor {
protectedBody = nextStatement.getProtectedBody(); protectedBody = nextStatement.getProtectedBody();
} }
visitStatements(protectedBody); visitStatements(protectedBody);
writer.outdent().append("}").ws().append("catch").ws().append("($e)") writer.outdent().append("}").ws().append("catch").ws().append("($$e)")
.ws().append("{").indent().softNewLine(); .ws().append("{").indent().softNewLine();
writer.append("$je").ws().append("=").ws().append("$e.$javaException;").softNewLine(); writer.append("$$je").ws().append("=").ws().append("$$e.$javaException;").softNewLine();
for (TryCatchStatement catchClause : sequence) { for (TryCatchStatement catchClause : sequence) {
writer.append("if").ws().append("($je"); writer.append("if").ws().append("($$je");
if (catchClause.getExceptionType() != null) { if (catchClause.getExceptionType() != null) {
writer.ws().append("&&").ws().append("$je instanceof ") writer.ws().append("&&").ws().append("$$je instanceof ")
.appendClass(catchClause.getExceptionType()); .appendClass(catchClause.getExceptionType());
} }
writer.append(")").ws().append("{").indent().softNewLine(); writer.append(")").ws().append("{").indent().softNewLine();
if (catchClause.getExceptionVariable() != null) { if (catchClause.getExceptionVariable() != null) {
writer.append(variableName(catchClause.getExceptionVariable())).ws().append("=").ws() writer.append(variableName(catchClause.getExceptionVariable())).ws().append("=").ws()
.append("$je;").softNewLine(); .append("$$je;").softNewLine();
} }
visitStatements(catchClause.getHandler()); visitStatements(catchClause.getHandler());
writer.outdent().append("}").ws().append("else "); writer.outdent().append("}").ws().append("else ");
} }
writer.append("{").indent().softNewLine(); writer.append("{").indent().softNewLine();
writer.append("throw $e;").softNewLine(); writer.append("throw $$e;").softNewLine();
writer.outdent().append("}").softNewLine(); writer.outdent().append("}").softNewLine();
writer.outdent().append("}").softNewLine(); writer.outdent().append("}").softNewLine();
} catch (IOException e) { } catch (IOException e) {