Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(696)

Unified Diff: pkg/compiler/lib/src/dart_backend/backend_ast_to_frontend_ast.dart

Issue 787603003: Generative constructors in the new dart backend. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: pkg/compiler/lib/src/dart_backend/backend_ast_to_frontend_ast.dart
diff --git a/pkg/compiler/lib/src/dart_backend/backend_ast_to_frontend_ast.dart b/pkg/compiler/lib/src/dart_backend/backend_ast_to_frontend_ast.dart
index e0c50d261dd6ecb320569840c9d7068b80edf8ad..a7ae10d0586d8eebdb906dfe766aa5d42c8124e3 100644
--- a/pkg/compiler/lib/src/dart_backend/backend_ast_to_frontend_ast.dart
+++ b/pkg/compiler/lib/src/dart_backend/backend_ast_to_frontend_ast.dart
@@ -342,6 +342,31 @@ class TreePrinter {
setElement(result, element, exp);
}
precedence = EXPRESSION;
+ } else if (exp is FieldInitializer) {
+ precedence = EXPRESSION;
+ tree.Node receiver = makeIdentifier('this');
+ tree.Node selector = makeIdentifier(exp.element.name);
+ tree.Operator op = new tree.Operator(assignmentToken("="));
+ // We pass CALLEE to ensure we write eg.:
+ // class B { var x; B() : x = (() {return a;}) {}}
+ // Not the invalid:
+ // class B { var x; B() : x = () {return a;} {}}
+ result = new tree.SendSet(receiver, selector, op,
+ singleton(makeExp(exp.body, CALLEE)));
+ setElement(result, exp.element, exp);
+ } else if (exp is SuperInitializer) {
+ precedence = EXPRESSION;
+ tree.Node receiver = makeIdentifier('super');
+ tree.NodeList arguments =
+ argList(exp.arguments.map(makeArgument).toList());
+ if (exp.target.name == "") {
+ result = new tree.Send(null, receiver, arguments);
+ } else {
+ result = new tree.Send(receiver,
+ makeIdentifier(exp.target.name),
+ arguments);
+ }
+ setElement(result, exp.target, exp);
} else if (exp is BinaryOperator) {
precedence = BINARY_PRECEDENCE[exp.operator];
int deltaLeft = isAssociativeBinaryOperator(precedence) ? 0 : 1;
@@ -422,6 +447,24 @@ class TreePrinter {
? null
: makeExp(exp.object, PRIMARY, beginStmt: beginStmt);
result = new tree.Send(receiver, makeIdentifier(exp.fieldName));
+ } else if (exp is ConstructorDefinition) {
+ precedence = EXPRESSION;
+ tree.NodeList parameters = makeParameters(exp.parameters);
+ tree.NodeList initializers =
+ exp.initializers == null || exp.initializers.isEmpty
+ ? null
+ : makeList(",", exp.initializers.map(makeExpression).toList());
+ tree.Node body = exp.isConst || exp.body == null
+ ? new tree.EmptyStatement(semicolon)
+ : makeFunctionBody(exp.body);
+ result = new tree.FunctionExpression(constructorName(exp),
+ parameters,
+ body,
+ null, // return type
+ makeFunctionModifiers(exp),
+ initializers,
+ null, // get/set
+ null); // async modifier
} else if (exp is FunctionExpression) {
precedence = PRIMARY;
if (beginStmt && exp.name != null) {
@@ -1008,7 +1051,8 @@ class TreePrinter {
if (exp.element == null) return makeEmptyModifiers();
return makeModifiers(isExternal: exp.element.isExternal,
isStatic: exp.element.isStatic,
- isFactory: exp.element.isFactoryConstructor);
+ isFactory: exp.element.isFactoryConstructor,
+ isConst: exp.element.isConst);
}
tree.Node makeNodeForClassElement(elements.ClassElement cls) {
@@ -1161,6 +1205,16 @@ class TreePrinter {
closeBrace);
}
+ tree.Node constructorName(ConstructorDefinition exp) {
+ String name = exp.name;
+ tree.Identifier className = makeIdentifier(exp.element.enclosingClass.name);
+ tree.Node result = name == ""
+ ? className
+ : new tree.Send(className, makeIdentifier(name));
+ setElement(result, exp.element, exp);
+ return result;
+ }
+
tree.Node functionName(FunctionExpression exp) {
String name = exp.name;
if (name == null) return null;

Powered by Google App Engine
This is Rietveld 408576698