languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-11-02 10:49:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

dart2js: Distinguish precedence levels for left-hand side and call.

Browse source 
This fixes an issue where `new (f())()` was emitted as `new f()()`.

This in turn fixes some JS interop issues in the CPS backend.

CLOSES #25708

BUG=
R=sigmund@google.com

Review URL: https://codereview.chromium.org/1681863003 .
This commit is contained in:
Asger Feldthaus 2016-02-09 17:15:00 +01:00
parent 20d31ea8c3
commit ba582b48b3
4 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkg/js_ast/lib/src/nodes.dart
View file

@ -904,7 +904,7 @@ class NamedFunction extends Expression {
} }
NamedFunction _clone() => new NamedFunction(name, function); NamedFunction _clone() => new NamedFunction(name, function);
int get precedenceLevel => CALL; int get precedenceLevel => LEFT_HAND_SIDE;
} }
class Fun extends Expression { class Fun extends Expression {
@ -923,7 +923,7 @@ class Fun extends Expression {
Fun _clone() => new Fun(params, body, asyncModifier: asyncModifier); Fun _clone() => new Fun(params, body, asyncModifier: asyncModifier);
int get precedenceLevel => CALL; int get precedenceLevel => LEFT_HAND_SIDE;
} }
class AsyncModifier { class AsyncModifier {
@ -969,7 +969,7 @@ class PropertyAccess extends Expression {
PropertyAccess _clone() => new PropertyAccess(receiver, selector); PropertyAccess _clone() => new PropertyAccess(receiver, selector);
int get precedenceLevel => CALL; int get precedenceLevel => LEFT_HAND_SIDE;
} }
/// A [DeferredToken] is a placeholder for some [Expression] that is not known /// A [DeferredToken] is a placeholder for some [Expression] that is not known

9
pkg/js_ast/lib/src/precedence.dart
View file

@ -17,9 +17,6 @@ const SHIFT = RELATIONAL + 1;
const ADDITIVE = SHIFT + 1; const ADDITIVE = SHIFT + 1;
const MULTIPLICATIVE = ADDITIVE + 1; const MULTIPLICATIVE = ADDITIVE + 1;
const UNARY = MULTIPLICATIVE + 1; const UNARY = MULTIPLICATIVE + 1;
const LEFT_HAND_SIDE = UNARY + 1; const CALL = UNARY + 1;
// We merge new, call and member expressions. const LEFT_HAND_SIDE = CALL + 1;
// This means that we have to emit parenthesis for 'new's. For example `new X;` const PRIMARY = LEFT_HAND_SIDE + 1;
// should be printed as `new X();`. This simplifies the requirements.
const CALL = LEFT_HAND_SIDE;
const PRIMARY = CALL + 1;

8
pkg/js_ast/lib/src/printer.dart
View file

@ -678,7 +678,7 @@ class Printer implements NodeVisitor {
@override @override
visitAssignment(Assignment assignment) { visitAssignment(Assignment assignment) {
visitNestedExpression(assignment.leftHandSide, LEFT_HAND_SIDE, visitNestedExpression(assignment.leftHandSide, CALL,
newInForInit: inForInit, newInForInit: inForInit,
newAtStatementBegin: atStatementBegin); newAtStatementBegin: atStatementBegin);
if (assignment.value != null) { if (assignment.value != null) {
@ -719,7 +719,7 @@ class Printer implements NodeVisitor {
@override @override
visitNew(New node) { visitNew(New node) {
out("new "); out("new ");
visitNestedExpression(node.target, CALL, visitNestedExpression(node.target, LEFT_HAND_SIDE,
newInForInit: inForInit, newAtStatementBegin: false); newInForInit: inForInit, newAtStatementBegin: false);
out("("); out("(");
visitCommaSeparated(node.arguments, ASSIGNMENT, visitCommaSeparated(node.arguments, ASSIGNMENT,
@ -729,7 +729,7 @@ class Printer implements NodeVisitor {
@override @override
visitCall(Call call) { visitCall(Call call) {
visitNestedExpression(call.target, LEFT_HAND_SIDE, visitNestedExpression(call.target, CALL,
newInForInit: inForInit, newInForInit: inForInit,
newAtStatementBegin: atStatementBegin); newAtStatementBegin: atStatementBegin);
out("("); out("(");
@ -872,7 +872,7 @@ class Printer implements NodeVisitor {
@override @override
void visitPostfix(Postfix postfix) { void visitPostfix(Postfix postfix) {
visitNestedExpression(postfix.argument, LEFT_HAND_SIDE, visitNestedExpression(postfix.argument, CALL,
newInForInit: inForInit, newInForInit: inForInit,
newAtStatementBegin: atStatementBegin); newAtStatementBegin: atStatementBegin);
out(postfix.op); out(postfix.op);

2
tests/html/html.status
View file

@ -452,6 +452,4 @@ js_typed_interop_test: RuntimeError # Need package:js support #24978
mirrors_js_typed_interop_test: RuntimeError # Need package:js support #24978 mirrors_js_typed_interop_test: RuntimeError # Need package:js support #24978
# These are raw dart:js tests that fail due to bugs in the CPS IR: # These are raw dart:js tests that fail due to bugs in the CPS IR:
js_test/JsObject_methods: RuntimeError # Bad code for new #(). Issue #25708
js_test/new_JsObject: RuntimeError # Bad code for new #(). Issue #25708
js_test/Dart_functions: RuntimeError # Tree-shaking an escaping closure #25720 js_test/Dart_functions: RuntimeError # Tree-shaking an escaping closure #25720