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

Unified Diff: pkg/front_end/lib/src/fasta/parser/token_stream_rewriter.dart

Issue 2872433005: more work aligning fasta.Token with analyzer.Token (Closed)
Patch Set: Created 3 years, 7 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
Index: pkg/front_end/lib/src/fasta/parser/token_stream_rewriter.dart
diff --git a/pkg/front_end/lib/src/fasta/parser/token_stream_rewriter.dart b/pkg/front_end/lib/src/fasta/parser/token_stream_rewriter.dart
index 7216a2feb814645c19d2a1980525d86ffa79e256..a6dfa523f315878324e35319ee50fd701fce2b3a 100644
--- a/pkg/front_end/lib/src/fasta/parser/token_stream_rewriter.dart
+++ b/pkg/front_end/lib/src/fasta/parser/token_stream_rewriter.dart
@@ -26,8 +26,8 @@ class TokenStreamRewriter {
/// Creates a [TokenStreamRewriter] which is prepared to rewrite the token
/// stream whose first token is [firstToken].
TokenStreamRewriter(Token firstToken)
- : _head = firstToken.previousToken ??
- (new SymbolToken.eof(-1)..next = firstToken);
+ : _head =
+ firstToken.previous ?? (new SymbolToken.eof(-1)..next = firstToken);
/// Gets the first token in the stream (which may not be the same token that
/// was passed to the constructor, if something was inserted before it).
@@ -47,8 +47,8 @@ class TokenStreamRewriter {
// Note: even though previousToken is deprecated, we need to hook it up in
// case any uses of it remain. Once previousToken is removed it should be
// safe to remove this block of code.
- insertionPoint.previousToken = newToken;
- newToken.previousToken = previous;
+ insertionPoint.previous = newToken;
+ newToken.previous = previous;
}
}
@@ -59,8 +59,8 @@ class TokenStreamRewriter {
// we're accessing the deprecated member previousToken here, because we have
// a fallback if it is not available. Once previousToken is removed, we can
// remove the "if" test below, and always use the fallback code.
- if (target.previousToken != null) {
- return target.previousToken;
+ if (target.previous != null) {
+ return target.previous;
}
// Look for the previous token by scanning forward from [lastPreviousToken],

Powered by Google App Engine
This is Rietveld 408576698