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

Unified Diff: pkg/compiler/lib/src/scanner/scanner.dart

Issue 1859343004: dartfmt pkg/compiler (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 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
Index: pkg/compiler/lib/src/scanner/scanner.dart
diff --git a/pkg/compiler/lib/src/scanner/scanner.dart b/pkg/compiler/lib/src/scanner/scanner.dart
index 1a52a64562f60659b88a1bbca8c2f816689d9b9e..30d5caf5b2c18aafdf49c13c4072ea854a5d4ad2 100644
--- a/pkg/compiler/lib/src/scanner/scanner.dart
+++ b/pkg/compiler/lib/src/scanner/scanner.dart
@@ -4,29 +4,21 @@
library dart2js.scanner;
-import '../io/source_file.dart' show
- SourceFile,
- Utf8BytesSourceFile;
-import '../tokens/keyword.dart' show
- Keyword,
- KeywordState;
+import '../io/source_file.dart' show SourceFile, Utf8BytesSourceFile;
+import '../tokens/keyword.dart' show Keyword, KeywordState;
import '../tokens/precedence.dart';
import '../tokens/precedence_constants.dart';
import '../tokens/token.dart';
import '../tokens/token_constants.dart';
import '../util/characters.dart';
-import 'string_scanner.dart' show
- StringScanner;
-import 'utf8_bytes_scanner.dart' show
- Utf8BytesScanner;
-
+import 'string_scanner.dart' show StringScanner;
+import 'utf8_bytes_scanner.dart' show Utf8BytesScanner;
abstract class Scanner {
Token tokenize();
- factory Scanner(SourceFile file,
- {bool includeComments: false}) {
+ factory Scanner(SourceFile file, {bool includeComments: false}) {
if (file is Utf8BytesSourceFile) {
return new Utf8BytesScanner(file, includeComments: includeComments);
} else {
@@ -72,8 +64,7 @@ abstract class AbstractScanner implements Scanner {
final List<int> lineStarts = <int>[0];
- AbstractScanner(
- this.file, this.includeComments) {
+ AbstractScanner(this.file, this.includeComments) {
this.tail = this.tokens;
}
@@ -166,8 +157,8 @@ abstract class AbstractScanner implements Scanner {
* Note that [extraOffset] can only be used if the covered character(s) are
* known to be ASCII.
*/
- void appendSubstringToken(PrecedenceInfo info, int start,
- bool asciiOnly, [int extraOffset]);
+ void appendSubstringToken(PrecedenceInfo info, int start, bool asciiOnly,
+ [int extraOffset]);
/** Documentation in subclass [ArrayBasedScanner]. */
void appendPrecedenceToken(PrecedenceInfo info);
@@ -236,8 +227,10 @@ abstract class AbstractScanner implements Scanner {
int bigSwitch(int next) {
beginToken();
- if (identical(next, $SPACE) || identical(next, $TAB)
- || identical(next, $LF) || identical(next, $CR)) {
+ if (identical(next, $SPACE) ||
+ identical(next, $TAB) ||
+ identical(next, $LF) ||
+ identical(next, $CR)) {
appendWhiteSpace(next);
next = advance();
// Sequences of spaces are common, so advance through them fast.
@@ -354,8 +347,8 @@ abstract class AbstractScanner implements Scanner {
}
if (identical(next, $CLOSE_SQUARE_BRACKET)) {
- return appendEndGroup(CLOSE_SQUARE_BRACKET_INFO,
- OPEN_SQUARE_BRACKET_TOKEN);
+ return appendEndGroup(
+ CLOSE_SQUARE_BRACKET_INFO, OPEN_SQUARE_BRACKET_TOKEN);
}
if (identical(next, $BACKPING)) {
@@ -369,8 +362,7 @@ abstract class AbstractScanner implements Scanner {
}
if (identical(next, $CLOSE_CURLY_BRACKET)) {
- return appendEndGroup(CLOSE_CURLY_BRACKET_INFO,
- OPEN_CURLY_BRACKET_TOKEN);
+ return appendEndGroup(CLOSE_CURLY_BRACKET_INFO, OPEN_CURLY_BRACKET_TOKEN);
}
if (identical(next, $SLASH)) {
@@ -394,9 +386,15 @@ abstract class AbstractScanner implements Scanner {
}
// TODO(ahe): Would a range check be faster?
- if (identical(next, $1) || identical(next, $2) || identical(next, $3)
- || identical(next, $4) || identical(next, $5) || identical(next, $6)
- || identical(next, $7) || identical(next, $8) || identical(next, $9)) {
+ if (identical(next, $1) ||
+ identical(next, $2) ||
+ identical(next, $3) ||
+ identical(next, $4) ||
+ identical(next, $5) ||
+ identical(next, $6) ||
+ identical(next, $7) ||
+ identical(next, $8) ||
+ identical(next, $9)) {
return tokenizeNumber(next);
}
@@ -429,8 +427,8 @@ abstract class AbstractScanner implements Scanner {
next = advance();
if (next > 127) asciiOnly = false;
} while (!identical(next, $LF) &&
- !identical(next, $CR) &&
- !identical(next, $EOF));
+ !identical(next, $CR) &&
+ !identical(next, $EOF));
if (!asciiOnly) handleUnicode(start);
return next;
}
@@ -655,9 +653,9 @@ abstract class AbstractScanner implements Scanner {
bool hasDigits = false;
while (true) {
next = advance();
- if (($0 <= next && next <= $9)
- || ($A <= next && next <= $F)
- || ($a <= next && next <= $f)) {
+ if (($0 <= next && next <= $9) ||
+ ($A <= next && next <= $F) ||
+ ($a <= next && next <= $f)) {
hasDigits = true;
} else {
if (!hasDigits) {
@@ -766,7 +764,6 @@ abstract class AbstractScanner implements Scanner {
return null;
}
-
int tokenizeMultiLineComment(int next, int start) {
bool asciiOnlyComment = true; // Track if the entire comment is ASCII.
bool asciiOnlyLines = true; // Track ASCII since the last handleUnicode.
@@ -924,8 +921,8 @@ abstract class AbstractScanner implements Scanner {
asciiOnly = true;
continue;
}
- if (next <= $CR
- && (identical(next, $LF) ||
+ if (next <= $CR &&
+ (identical(next, $LF) ||
identical(next, $CR) ||
identical(next, $EOF))) {
if (!asciiOnly) handleUnicode(start);
@@ -960,7 +957,7 @@ abstract class AbstractScanner implements Scanner {
next = bigSwitch(next);
}
if (identical(next, $EOF)) return next;
- next = advance(); // Move past the $STX.
+ next = advance(); // Move past the $STX.
beginToken(); // The string interpolation suffix starts here.
return next;
}
« no previous file with comments | « pkg/compiler/lib/src/scanner/array_based_scanner.dart ('k') | pkg/compiler/lib/src/scanner/scanner_task.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698