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

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

Issue 2804843003: Fix some crashes. (Closed)
Patch Set: Created 3 years, 8 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 | « pkg/front_end/lib/src/fasta/fasta.dart ('k') | pkg/front_end/lib/src/fasta/source/source_loader.dart » ('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 d6fd6f78c2730606594810ce1c412ee646e7bfde..a597d5ad9215e9c2ee193b4d734acd44530c6a1f 100644
--- a/pkg/front_end/lib/src/fasta/kernel/body_builder.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/body_builder.dart
@@ -731,7 +731,7 @@ class BodyBuilder extends ScopeListener<JumpTarget> implements BuilderHelper {
addCompileTimeError(
token.charOffset, "Not a constant expression: $context");
}
- push(new Identifier(name)..fileOffset = token.charOffset);
+ push(new Identifier(name, token.charOffset));
}
/// Look up [name] in [scope] using [charOffset] to report any
@@ -1464,7 +1464,7 @@ class BodyBuilder extends ScopeListener<JumpTarget> implements BuilderHelper {
debugEvent("ValuedFormalParameter");
Expression initializer = popForValue();
Identifier name = pop();
- push(new InitializedIdentifier(name.name, initializer));
+ push(new InitializedIdentifier(name.name, initializer, name.fileOffset));
}
@override
@@ -1662,7 +1662,7 @@ class BodyBuilder extends ScopeListener<JumpTarget> implements BuilderHelper {
} else if (prefix is ClassBuilder) {
type = prefix;
} else {
- type = new Identifier(start.lexeme)..fileOffset = start.charOffset;
+ type = new Identifier(start.lexeme, start.charOffset);
}
}
String name;
@@ -2394,7 +2394,8 @@ class BodyBuilder extends ScopeListener<JumpTarget> implements BuilderHelper {
@override
void handleSymbolVoid(Token token) {
- logEvent("SymbolVoid");
+ debugEvent("SymbolVoid");
+ push(new Identifier(token.stringValue, token.charOffset));
}
dynamic addCompileTimeError(int charOffset, String message,
@@ -2448,7 +2449,9 @@ class BodyBuilder extends ScopeListener<JumpTarget> implements BuilderHelper {
class Identifier extends InvalidExpression {
final String name;
- Identifier(this.name);
+ Identifier(this.name, int charOffset) {
+ fileOffset = charOffset;
+ }
Expression get initializer => null;
@@ -2467,7 +2470,8 @@ class Operator extends InvalidExpression {
class InitializedIdentifier extends Identifier {
final Expression initializer;
- InitializedIdentifier(String name, this.initializer) : super(name);
+ InitializedIdentifier(String name, this.initializer, int charOffset)
+ : super(name, charOffset);
String toString() => "initialized-identifier($name, $initializer)";
}
« no previous file with comments | « pkg/front_end/lib/src/fasta/fasta.dart ('k') | pkg/front_end/lib/src/fasta/source/source_loader.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698