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

Unified Diff: pkg/front_end/lib/src/fasta/kernel/body_builder.dart

Issue 2733413002: Recover correctly from positional argument after named argument. (Closed)
Patch Set: Rename firstNamedArgumentIndex. Created 3 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 | tests/co19/co19-kernel.status » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 5fc973ad5d166c159635bf93227afd7783c0606b..e8dd69bbaa6a34b7c4eccd2667f21228c9c6b19d 100644
--- a/pkg/front_end/lib/src/fasta/kernel/body_builder.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/body_builder.dart
@@ -465,23 +465,27 @@ class BodyBuilder extends ScopeListener<JumpTarget> implements BuilderHelper {
void endArguments(int count, Token beginToken, Token endToken) {
debugEvent("Arguments");
List arguments = popList(count) ?? <Expression>[];
- int firstNamedArgument = arguments.length;
+ int firstNamedArgumentIndex = arguments.length;
for (int i = 0; i < arguments.length; i++) {
var node = arguments[i];
if (node is NamedExpression) {
- firstNamedArgument = i < firstNamedArgument ? i : firstNamedArgument;
+ firstNamedArgumentIndex =
+ i < firstNamedArgumentIndex ? i : firstNamedArgumentIndex;
} else {
- arguments[i] = node = toValue(node);
- if (i > firstNamedArgument) {
- internalError("Expected named argument: $node");
+ arguments[i] = toValue(node);
+ if (i > firstNamedArgumentIndex) {
+ arguments[i] = new NamedExpression(
+ "#$i",
+ buildCompileTimeError(
+ "Expected named argument.", arguments[i].fileOffset));
}
}
}
- if (firstNamedArgument < arguments.length) {
- List<Expression> positional =
- new List<Expression>.from(arguments.getRange(0, firstNamedArgument));
+ if (firstNamedArgumentIndex < arguments.length) {
+ List<Expression> positional = new List<Expression>.from(
+ arguments.getRange(0, firstNamedArgumentIndex));
List<NamedExpression> named = new List<NamedExpression>.from(
- arguments.getRange(firstNamedArgument, arguments.length));
+ arguments.getRange(firstNamedArgumentIndex, arguments.length));
push(new Arguments(positional, named: named));
} else {
push(new Arguments(arguments));
« no previous file with comments | « no previous file | tests/co19/co19-kernel.status » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698