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

Unified Diff: pkg/front_end/lib/src/fasta/scanner/abstract_scanner.dart

Issue 2664593002: Port parser and scanner fixes from rasta branch. (Closed)
Patch Set: Rebased on ef8ec26cf36d1f07b4fdf5d605003210826ae1c2. Created 3 years, 11 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/scanner/abstract_scanner.dart
diff --git a/pkg/front_end/lib/src/fasta/scanner/abstract_scanner.dart b/pkg/front_end/lib/src/fasta/scanner/abstract_scanner.dart
index e9ebd479f2fb88525dcfd7cc5bcc58701ec9fd3b..f4de827c7fa5399a8d90e8207653e0b2503b8d77 100644
--- a/pkg/front_end/lib/src/fasta/scanner/abstract_scanner.dart
+++ b/pkg/front_end/lib/src/fasta/scanner/abstract_scanner.dart
@@ -5,7 +5,13 @@
library fasta.scanner.abstract_scanner;
import '../scanner.dart' show
- Scanner;
+ ErrorToken,
+ Scanner,
+ buildUnexpectedCharacterToken;
+
+import 'error_token.dart' show
+ UnmatchedToken,
+ UnterminatedToken;
import 'keyword.dart' show
KeywordState,
@@ -14,14 +20,10 @@ import 'keyword.dart' show
import 'precedence.dart';
import 'token.dart' show
- BadInputToken,
BeginGroupToken,
- ErrorToken,
KeywordToken,
SymbolToken,
- Token,
- UnmatchedToken,
- UnterminatedToken;
+ Token;
import 'token_constants.dart';
@@ -394,13 +396,6 @@ abstract class AbstractScanner implements Scanner {
next = currentAsUnicode(next);
- // The following are non-ASCII characters.
-
- if (identical(next, $NBSP)) {
- appendWhiteSpace(next);
- return advance();
- }
-
return unexpected(next);
}
@@ -1073,7 +1068,7 @@ abstract class AbstractScanner implements Scanner {
}
int unexpected(int character) {
- appendErrorToken(new BadInputToken(character, tokenStart));
+ appendErrorToken(buildUnexpectedCharacterToken(character, tokenStart));
return advanceAfterError(true);
}
« no previous file with comments | « pkg/front_end/lib/src/fasta/scanner.dart ('k') | pkg/front_end/lib/src/fasta/scanner/array_based_scanner.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698