Index: pkg/front_end/lib/src/fasta/kernel/body_builder.dart |
diff --git a/pkg/front_end/lib/src/fasta/kernel/body_builder.dart b/pkg/front_end/lib/src/fasta/kernel/body_builder.dart |
index 22e7d3ea8f06dcadd03b043e2ce0e797703ba090..4ab3a43f6ad34a8a707ad4d1fd888274d2d61e3f 100644 |
--- a/pkg/front_end/lib/src/fasta/kernel/body_builder.dart |
+++ b/pkg/front_end/lib/src/fasta/kernel/body_builder.dart |
@@ -14,7 +14,7 @@ import '../parser/identifier_context.dart' show IdentifierContext; |
import 'package:front_end/src/fasta/builder/ast_factory.dart' show AstFactory; |
import 'package:front_end/src/fasta/kernel/kernel_shadow_ast.dart' |
- show KernelField; |
+ show KernelArguments, KernelField; |
import 'package:front_end/src/fasta/kernel/utils.dart' show offsetForToken; |
@@ -567,9 +567,9 @@ class BodyBuilder extends ScopeListener<JumpTarget> implements BuilderHelper { |
arguments.getRange(0, firstNamedArgumentIndex)); |
List<NamedExpression> named = new List<NamedExpression>.from( |
arguments.getRange(firstNamedArgumentIndex, arguments.length)); |
- push(new Arguments(positional, named: named)); |
+ push(astFactory.arguments(positional, named: named)); |
} else { |
- push(new Arguments(arguments)); |
+ push(astFactory.arguments(arguments)); |
} |
} |
@@ -783,7 +783,7 @@ class BodyBuilder extends ScopeListener<JumpTarget> implements BuilderHelper { |
coreTypes.getClass("dart:core", "NoSuchMethodError").constructors.first; |
return new Throw(new ConstructorInvocation( |
constructor, |
- new Arguments(<Expression>[ |
+ astFactory.arguments(<Expression>[ |
astFactory.nullLiteral(null), |
new SymbolLiteral(name), |
new ListLiteral(arguments.positional), |
@@ -1932,7 +1932,7 @@ class BodyBuilder extends ScopeListener<JumpTarget> implements BuilderHelper { |
void endNewExpression(Token token) { |
debugEvent("NewExpression"); |
Token nameToken = token.next; |
- Arguments arguments = pop(); |
+ KernelArguments arguments = pop(); |
String name = pop(); |
List<DartType> typeArguments = pop(); |
var type = pop(); |
@@ -1945,7 +1945,7 @@ class BodyBuilder extends ScopeListener<JumpTarget> implements BuilderHelper { |
if (typeArguments != null) { |
assert(arguments.types.isEmpty); |
- arguments.types.addAll(typeArguments); |
+ astFactory.setExplicitArgumentTypes(arguments, typeArguments); |
} |
String errorName; |
@@ -2545,7 +2545,7 @@ class BodyBuilder extends ScopeListener<JumpTarget> implements BuilderHelper { |
String message = formatUnexpected(uri, charOffset, error); |
Builder constructor = library.loader.getCompileTimeError(); |
return new Throw(buildStaticInvocation(constructor.target, |
- new Arguments(<Expression>[new StringLiteral(message)]))); |
+ astFactory.arguments(<Expression>[new StringLiteral(message)]))); |
} |
Expression buildAbstractClassInstantiationError(String className, |
@@ -2554,7 +2554,7 @@ class BodyBuilder extends ScopeListener<JumpTarget> implements BuilderHelper { |
charOffset); |
Builder constructor = library.loader.getAbstractClassInstantiationError(); |
return new Throw(buildStaticInvocation(constructor.target, |
- new Arguments(<Expression>[new StringLiteral(className)]))); |
+ astFactory.arguments(<Expression>[new StringLiteral(className)]))); |
} |
Statement buildCompileTimeErrorStatement(error, [int charOffset = -1]) { |