From 7c4b4ebe77b82752d05523366a6c46c40bc1b2d7 Mon Sep 17 00:00:00 2001 From: Alexey Andreev Date: Sun, 11 Oct 2015 18:03:46 +0300 Subject: [PATCH] Fix bug. Integrate precedence API into JSO --- .../java/org/teavm/javascript/Renderer.java | 2 +- .../org/teavm/jso/impl/JSBodyAstEmitter.java | 3 +- .../org/teavm/jso/impl/JSNativeGenerator.java | 61 ++++++++++++------- .../jso/{ => test}/ImplementationTest.java | 2 +- 4 files changed, 42 insertions(+), 26 deletions(-) rename tests/src/test/java/org/teavm/jso/{ => test}/ImplementationTest.java (97%) diff --git a/core/src/main/java/org/teavm/javascript/Renderer.java b/core/src/main/java/org/teavm/javascript/Renderer.java index 1c1805fea..f8c218ce4 100644 --- a/core/src/main/java/org/teavm/javascript/Renderer.java +++ b/core/src/main/java/org/teavm/javascript/Renderer.java @@ -1603,7 +1603,7 @@ public class Renderer implements ExprVisitor, StatementVisitor, RenderingContext expr.getOperand().acceptVisitor(this); writer.ws().append("&").ws().append("65535"); if (outerPrecedence.ordinal() > Precedence.BITWISE_AND.ordinal()) { - writer.append('('); + writer.append(')'); } break; case NULL_CHECK: diff --git a/jso/impl/src/main/java/org/teavm/jso/impl/JSBodyAstEmitter.java b/jso/impl/src/main/java/org/teavm/jso/impl/JSBodyAstEmitter.java index ac3cbe045..f35ee14f3 100644 --- a/jso/impl/src/main/java/org/teavm/jso/impl/JSBodyAstEmitter.java +++ b/jso/impl/src/main/java/org/teavm/jso/impl/JSBodyAstEmitter.java @@ -44,7 +44,8 @@ class JSBodyAstEmitter implements JSBodyEmitter { int paramIndex = 0; if (!isStatic) { int index = paramIndex++; - astWriter.declareNameEmitter("this", prec -> context.writeExpr(context.getArgument(index))); + astWriter.declareNameEmitter("this", prec -> context.writeExpr(context.getArgument(index), + convert(prec))); } for (int i = 0; i < parameterNames.length; ++i) { int index = paramIndex++; diff --git a/jso/impl/src/main/java/org/teavm/jso/impl/JSNativeGenerator.java b/jso/impl/src/main/java/org/teavm/jso/impl/JSNativeGenerator.java index 685a12f00..e8151ae29 100644 --- a/jso/impl/src/main/java/org/teavm/jso/impl/JSNativeGenerator.java +++ b/jso/impl/src/main/java/org/teavm/jso/impl/JSNativeGenerator.java @@ -20,6 +20,7 @@ import org.teavm.codegen.SourceWriter; import org.teavm.dependency.DependencyAgent; import org.teavm.dependency.DependencyPlugin; import org.teavm.dependency.MethodDependency; +import org.teavm.javascript.Precedence; import org.teavm.javascript.Renderer; import org.teavm.javascript.ast.ConstantExpr; import org.teavm.javascript.ast.Expr; @@ -76,41 +77,45 @@ public class JSNativeGenerator implements Injector, DependencyPlugin, Generator SourceWriter writer = context.getWriter(); switch (methodRef.getName()) { case "get": - context.writeExpr(context.getArgument(0)); + context.writeExpr(context.getArgument(0), Precedence.MEMBER_ACCESS); renderProperty(context.getArgument(1), context); break; case "set": - writer.append('('); - context.writeExpr(context.getArgument(0)); + context.writeExpr(context.getArgument(0), Precedence.ASSIGNMENT.next()); renderProperty(context.getArgument(1), context); writer.ws().append('=').ws(); - context.writeExpr(context.getArgument(2)); - writer.append(')'); + context.writeExpr(context.getArgument(2), Precedence.ASSIGNMENT.next()); break; case "invoke": - context.writeExpr(context.getArgument(0)); + context.writeExpr(context.getArgument(0), Precedence.GROUPING); renderProperty(context.getArgument(1), context); writer.append('('); for (int i = 2; i < context.argumentCount(); ++i) { if (i > 2) { writer.append(',').ws(); } - context.writeExpr(context.getArgument(i)); + context.writeExpr(context.getArgument(i), Precedence.min()); } writer.append(')'); break; case "instantiate": - writer.append("(new ("); - context.writeExpr(context.getArgument(0)); + if (context.getPrecedence().ordinal() >= Precedence.FUNCTION_CALL.ordinal()) { + writer.append("("); + } + writer.append("new "); + context.writeExpr(context.getArgument(0), Precedence.GROUPING); renderProperty(context.getArgument(1), context); - writer.append(")("); + writer.append("("); for (int i = 2; i < context.argumentCount(); ++i) { if (i > 2) { writer.append(',').ws(); } - context.writeExpr(context.getArgument(i)); + context.writeExpr(context.getArgument(i), Precedence.min()); + } + writer.append(")"); + if (context.getPrecedence().ordinal() >= Precedence.FUNCTION_CALL.ordinal()) { + writer.append(")"); } - writer.append("))"); break; case "wrap": if (methodRef.getDescriptor().parameterType(0).isObject("java.lang.String")) { @@ -122,14 +127,19 @@ public class JSNativeGenerator implements Injector, DependencyPlugin, Generator } } writer.append("$rt_ustr("); - context.writeExpr(context.getArgument(0)); + context.writeExpr(context.getArgument(0), Precedence.min()); writer.append(")"); } else if (methodRef.getDescriptor().parameterType(0) == ValueType.BOOLEAN) { - writer.append("(!!("); - context.writeExpr(context.getArgument(0)); - writer.append("))"); + if (context.getPrecedence().ordinal() >= Precedence.UNARY.ordinal()) { + writer.append("("); + } + writer.append("!!"); + context.writeExpr(context.getArgument(0), Precedence.UNARY); + if (context.getPrecedence().ordinal() >= Precedence.UNARY.ordinal()) { + writer.append(")"); + } } else { - context.writeExpr(context.getArgument(0)); + context.writeExpr(context.getArgument(0), context.getPrecedence()); } break; case "function": @@ -137,17 +147,22 @@ public class JSNativeGenerator implements Injector, DependencyPlugin, Generator break; case "unwrapString": writer.append("$rt_str("); - context.writeExpr(context.getArgument(0)); + context.writeExpr(context.getArgument(0), Precedence.min()); writer.append(")"); break; case "unwrapBoolean": - writer.append("("); - context.writeExpr(context.getArgument(0)); - writer.ws().append("?").ws().append("1").ws().append(":").ws().append("0").append(")"); + if (context.getPrecedence().ordinal() >= Precedence.CONDITIONAL.ordinal()) { + writer.append("("); + } + context.writeExpr(context.getArgument(0), Precedence.CONDITIONAL.next()); + writer.ws().append("?").ws().append("1").ws().append(":").ws().append("0"); + if (context.getPrecedence().ordinal() >= Precedence.CONDITIONAL.ordinal()) { + writer.append(")"); + } break; default: if (methodRef.getName().startsWith("unwrap")) { - context.writeExpr(context.getArgument(0)); + context.writeExpr(context.getArgument(0), context.getPrecedence()); } break; } @@ -199,7 +214,7 @@ public class JSNativeGenerator implements Injector, DependencyPlugin, Generator String name = extractPropertyName(property); if (name == null) { writer.append('['); - context.writeExpr(property); + context.writeExpr(property, Precedence.min()); writer.append(']'); } else if (!isIdentifier(name)) { writer.append("[\""); diff --git a/tests/src/test/java/org/teavm/jso/ImplementationTest.java b/tests/src/test/java/org/teavm/jso/test/ImplementationTest.java similarity index 97% rename from tests/src/test/java/org/teavm/jso/ImplementationTest.java rename to tests/src/test/java/org/teavm/jso/test/ImplementationTest.java index d8d357641..b61848af4 100644 --- a/tests/src/test/java/org/teavm/jso/ImplementationTest.java +++ b/tests/src/test/java/org/teavm/jso/test/ImplementationTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.teavm.jso; +package org.teavm.jso.test; import static org.junit.Assert.*; import org.junit.Test;