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

Unified Diff: pkg/analyzer/lib/src/generated/scanner.dart

Issue 322603002: New analyzer snapshot. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 6 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/analyzer/lib/src/generated/resolver.dart ('k') | pkg/analyzer/lib/src/generated/sdk.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analyzer/lib/src/generated/scanner.dart
diff --git a/pkg/analyzer/lib/src/generated/scanner.dart b/pkg/analyzer/lib/src/generated/scanner.dart
index 0153b3c7cd9f7eb7d497a344bcf4034799878873..2d50d1112d16bcd68a8d8279daacf9634fd8c54e 100644
--- a/pkg/analyzer/lib/src/generated/scanner.dart
+++ b/pkg/analyzer/lib/src/generated/scanner.dart
@@ -1631,8 +1631,8 @@ class Scanner {
while (next != -1) {
if (next == 0x24) {
_appendStringToken(TokenType.STRING, _reader.getString(start, -1));
- _beginToken();
next = _tokenizeStringInterpolation(start);
+ _beginToken();
start = _reader.offset;
continue;
}
@@ -1678,7 +1678,11 @@ class Scanner {
}
}
_reportError(ScannerErrorCode.UNTERMINATED_STRING_LITERAL, []);
- _appendStringToken(TokenType.STRING, _reader.getString(start, 0));
+ if (start == _reader.offset) {
+ _appendStringTokenWithOffset(TokenType.STRING, "", 1);
+ } else {
+ _appendStringToken(TokenType.STRING, _reader.getString(start, 0));
+ }
return _reader.advance();
}
@@ -1750,7 +1754,7 @@ class Scanner {
return _reader.advance();
} else if (next == 0xD || next == 0xA) {
_reportError(ScannerErrorCode.UNTERMINATED_STRING_LITERAL, []);
- _appendStringToken(TokenType.STRING, _reader.getString(start, 0));
+ _appendStringToken(TokenType.STRING, _reader.getString(start, -1));
return _reader.advance();
}
next = _reader.advance();
@@ -1766,14 +1770,20 @@ class Scanner {
next = _reader.advance();
} else if (next == 0x24) {
_appendStringToken(TokenType.STRING, _reader.getString(start, -1));
- _beginToken();
next = _tokenizeStringInterpolation(start);
+ _beginToken();
start = _reader.offset;
continue;
}
if (next <= 0xD && (next == 0xA || next == 0xD || next == -1)) {
_reportError(ScannerErrorCode.UNTERMINATED_STRING_LITERAL, []);
- _appendStringToken(TokenType.STRING, _reader.getString(start, 0));
+ if (start == _reader.offset) {
+ _appendStringTokenWithOffset(TokenType.STRING, "", 1);
+ } else if (next == -1) {
+ _appendStringToken(TokenType.STRING, _reader.getString(start, 0));
+ } else {
+ _appendStringToken(TokenType.STRING, _reader.getString(start, -1));
+ }
return _reader.advance();
}
next = _reader.advance();
@@ -1911,6 +1921,9 @@ class ScannerErrorCode extends Enum<ScannerErrorCode> implements ErrorCode {
@override
ErrorType get type => ErrorType.SYNTACTIC_ERROR;
+
+ @override
+ String get uniqueName => "${runtimeType.toString()}.${name}";
}
/**
« no previous file with comments | « pkg/analyzer/lib/src/generated/resolver.dart ('k') | pkg/analyzer/lib/src/generated/sdk.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698