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

Unified Diff: frog/leg/compile_time_constants.dart

Issue 9701072: Revert r5529. Breaks frog and web bots. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years, 9 months 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
« no previous file with comments | « no previous file | frog/leg/resolver.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: frog/leg/compile_time_constants.dart
===================================================================
--- frog/leg/compile_time_constants.dart (revision 5530)
+++ frog/leg/compile_time_constants.dart (working copy)
@@ -901,21 +901,37 @@
}
Constant visitNewExpression(NewExpression node) {
+ List<Constant> compileArguments() {
+ if (!node.isConst()) error(node);
+ Send send = node.send;
+ List<Constant> arguments;
+ if (send.arguments.isEmpty()) {
+ arguments = const <Constant>[];
+ } else {
+ arguments = <Constant>[];
+ for (Link<Node> link = send.arguments;
+ !link.isEmpty();
+ link = link.tail) {
+ arguments.add(evaluate(link.head));
+ }
+ }
+ return arguments;
+ }
+
void assignArgumentsToParameters(
+ List<Constant> arguments,
FunctionParameters parameters,
Map<Element, Constant> constructorDefinitions,
Map<Element, Constant> fieldValues) {
- Send send = node.send;
- if (send.arguments.isEmpty() && parameters.parameterCount == 0) return;
- List<Constant> arguments = <Constant>[];
- Selector selector = elements.getSelector(send);
-
- Function compileArgument = evaluate;
- Function compileConstant = constantHandler.compileVariable;
- bool succeeded = selector.addSendArgumentsToList(
- send, arguments, parameters, compileArgument, compileConstant);
- if (!succeeded) error(node);
-
+ if (arguments.length != parameters.parameterCount) {
+ if (arguments.length < parameters.parameterCount &&
+ arguments.length >= parameters.requiredParameterCount) {
+ compiler.unimplemented("ConstantHandler with optional arguments",
+ node: node);
+ } else {
+ error(node);
+ }
+ }
int index = 0;
parameters.forEachParameter((Element parameter) {
Constant argument = arguments[index++];
@@ -971,8 +987,6 @@
return jsNewArguments;
}
- if (!node.isConst()) error(node);
-
// TODO(floitsch): get the type from somewhere.
FunctionElement constructor = elements[node.send];
ClassElement classElement = constructor.enclosingElement;
@@ -986,8 +1000,9 @@
Map<Element, Constant> constructorDefinitions =
new Map<Element, Constant>();
- assignArgumentsToParameters(parameters, constructorDefinitions,
- fieldValues);
+ List<Constant> arguments = compileArguments();
+ assignArgumentsToParameters(arguments, parameters,
+ constructorDefinitions, fieldValues);
CompileTimeConstantEvaluator initializerEvaluator =
new CompileTimeConstantEvaluator.insideConstructor(
constantHandler, constructorElements, compiler,
« no previous file with comments | « no previous file | frog/leg/resolver.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698