remove unused enable lazyAssignmentOperators flag
Change-Id: I4112fe4ad5a08916d124216753a995d607a9892d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/101485
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Dan Rubel <danrubel@google.com>
diff --git a/pkg/analyzer/lib/src/dart/scanner/scanner.dart b/pkg/analyzer/lib/src/dart/scanner/scanner.dart
index f24cf97..616b9fc 100644
--- a/pkg/analyzer/lib/src/dart/scanner/scanner.dart
+++ b/pkg/analyzer/lib/src/dart/scanner/scanner.dart
@@ -53,8 +53,6 @@
Token firstToken;
- bool scanLazyAssignmentOperators = false;
-
/**
* A flag indicating whether the scanner should recognize the `>>>` operator
* and the `>>>=` operator.
@@ -148,7 +146,6 @@
enableTripleShift: enableGtGtGt,
enableNonNullable: enableNonNullable),
includeComments: _preserveComments,
- scanLazyAssignmentOperators: scanLazyAssignmentOperators,
languageVersionChanged: _languageVersionChanged);
// fasta pretends there is an additional line at EOF
diff --git a/pkg/analyzer/test/generated/parser_fasta_test.dart b/pkg/analyzer/test/generated/parser_fasta_test.dart
index 72618e2..104879f 100644
--- a/pkg/analyzer/test/generated/parser_fasta_test.dart
+++ b/pkg/analyzer/test/generated/parser_fasta_test.dart
@@ -1464,11 +1464,6 @@
@override
bool allowNativeClause = false;
- @override
- set enableLazyAssignmentOperators(bool value) {
- // Lazy assignment operators are always enabled
- }
-
set enableOptionalNewAndConst(bool enable) {
// ignored
}
@@ -1910,10 +1905,7 @@
@override
Statement parseStatement(String source,
- {bool enableLazyAssignmentOperators,
- int expectedEndOffset,
- FeatureSet featureSet,
- bool inAsync = false}) {
+ {int expectedEndOffset, FeatureSet featureSet, bool inAsync = false}) {
createParser(source,
expectedEndOffset: expectedEndOffset, featureSet: featureSet);
if (inAsync) {
diff --git a/pkg/analyzer/test/generated/parser_test.dart b/pkg/analyzer/test/generated/parser_test.dart
index 9dd8c35..3e203b1 100644
--- a/pkg/analyzer/test/generated/parser_test.dart
+++ b/pkg/analyzer/test/generated/parser_test.dart
@@ -58,8 +58,6 @@
void set allowNativeClause(bool value);
- void set enableLazyAssignmentOperators(bool value);
-
/**
* Set a flag indicating whether the parser should parse instance creation
* expressions that lack either the `new` or `const` keyword.
@@ -233,8 +231,7 @@
SimpleIdentifier parseSimpleIdentifier(String code);
- Statement parseStatement(String source,
- {bool enableLazyAssignmentOperators, int expectedEndOffset});
+ Statement parseStatement(String source, {int expectedEndOffset});
Expression parseStringLiteral(String code);
@@ -6437,7 +6434,6 @@
void test_parseExpression_assign_compound() {
if (usingFastaParser && AbstractScanner.LAZY_ASSIGNMENT_ENABLED) {
- enableLazyAssignmentOperators = true;
Expression expression = parseExpression('x ||= y');
var assignmentExpression = expression as AssignmentExpression;
expect(assignmentExpression.leftHandSide, isNotNull);
@@ -9365,12 +9361,6 @@
bool parseAsync = true;
/**
- * A flag indicating whether lazy assignment operators should be enabled for
- * the test.
- */
- bool enableLazyAssignmentOperators = false;
-
- /**
* A flag indicating whether the parser should parse instance creation
* expressions that lack either the `new` or `const` keyword.
*/
@@ -9428,9 +9418,7 @@
//
// Scan the source.
//
- ScannerResult result = scanString(content,
- includeComments: true,
- scanLazyAssignmentOperators: enableLazyAssignmentOperators);
+ ScannerResult result = scanString(content, includeComments: true);
Token token = result.tokens;
if (result.hasErrors) {
// The default recovery strategy used by scanString
@@ -9578,9 +9566,7 @@
//
// Scan the source.
//
- ScannerResult result = scanString(content,
- includeComments: true,
- scanLazyAssignmentOperators: enableLazyAssignmentOperators);
+ ScannerResult result = scanString(content, includeComments: true);
Token token = result.tokens;
if (result.hasErrors) {
// The default recovery strategy used by scanString
@@ -9624,9 +9610,7 @@
//
// Scan the source.
//
- ScannerResult result = scanString(content,
- includeComments: true,
- scanLazyAssignmentOperators: enableLazyAssignmentOperators);
+ ScannerResult result = scanString(content, includeComments: true);
Token token = result.tokens;
if (result.hasErrors) {
// The default recovery strategy used by scanString
@@ -9964,13 +9948,9 @@
* Parse the given [content] as a statement. If [enableLazyAssignmentOperators]
* is `true`, then lazy assignment operators should be enabled.
*/
- Statement parseStatement(String content,
- {bool enableLazyAssignmentOperators, int expectedEndOffset}) {
+ Statement parseStatement(String content, {int expectedEndOffset}) {
Source source = new TestSource();
listener = new GatheringErrorListener();
- if (enableLazyAssignmentOperators != null) {
- this.enableLazyAssignmentOperators = enableLazyAssignmentOperators;
- }
void reportError(
ScannerErrorCode errorCode, int offset, List<Object> arguments) {
@@ -9981,9 +9961,7 @@
//
// Scan the source.
//
- ScannerResult result = scanString(content,
- includeComments: true,
- scanLazyAssignmentOperators: enableLazyAssignmentOperators);
+ ScannerResult result = scanString(content, includeComments: true);
Token token = result.tokens;
if (result.hasErrors) {
// The default recovery strategy used by scanString
@@ -10028,8 +10006,7 @@
//
// Scan the source.
//
- ScannerResult result = scanString(content,
- scanLazyAssignmentOperators: enableLazyAssignmentOperators);
+ ScannerResult result = scanString(content);
Token token = result.tokens;
if (result.hasErrors) {
// The default recovery strategy used by scanString
diff --git a/pkg/analyzer/test/generated/scanner_test.dart b/pkg/analyzer/test/generated/scanner_test.dart
index 93483ba..02039f4 100644
--- a/pkg/analyzer/test/generated/scanner_test.dart
+++ b/pkg/analyzer/test/generated/scanner_test.dart
@@ -168,12 +168,13 @@
}
}
- Token _scanWithListener(String source, GatheringErrorListener listener,
- {bool lazyAssignmentOperators: false}) {
+ Token _scanWithListener(
+ String source,
+ GatheringErrorListener listener,
+ ) {
Scanner scanner =
new Scanner(null, new CharSequenceReader(source), listener)
..configureFeatures(featureSet);
- scanner.scanLazyAssignmentOperators = lazyAssignmentOperators;
Token result = scanner.tokenize();
listener.setLineInfo(new TestSource(), scanner.lineStarts);
return result;
diff --git a/pkg/front_end/lib/src/fasta/scanner.dart b/pkg/front_end/lib/src/fasta/scanner.dart
index 7df276f..db6a662 100644
--- a/pkg/front_end/lib/src/fasta/scanner.dart
+++ b/pkg/front_end/lib/src/fasta/scanner.dart
@@ -90,7 +90,6 @@
{ScannerConfiguration configuration,
bool includeComments: false,
LanguageVersionChanged languageVersionChanged,
- bool scanLazyAssignmentOperators: false,
Recover recover}) {
assert(source != null, 'source must not be null');
StringScanner scanner = new StringScanner(source,
diff --git a/pkg/front_end/test/scanner_fasta_test.dart b/pkg/front_end/test/scanner_fasta_test.dart
index 9af6744..6af6e46 100644
--- a/pkg/front_end/test/scanner_fasta_test.dart
+++ b/pkg/front_end/test/scanner_fasta_test.dart
@@ -85,8 +85,7 @@
@reflectiveTest
class ScannerTest_Fasta extends ScannerTestBase {
@override
- Token scanWithListener(String source, ErrorListener listener,
- {bool lazyAssignmentOperators: false}) {
+ Token scanWithListener(String source, ErrorListener listener) {
var result = scanString(source, includeComments: true);
var token = result.tokens;
diff --git a/pkg/front_end/test/scanner_replacement_test.dart b/pkg/front_end/test/scanner_replacement_test.dart
index ea881a8..25ad95f 100644
--- a/pkg/front_end/test/scanner_replacement_test.dart
+++ b/pkg/front_end/test/scanner_replacement_test.dart
@@ -32,15 +32,12 @@
@reflectiveTest
class ScannerTest_Replacement extends ScannerTestBase {
@override
- analyzer.Token scanWithListener(String source, ErrorListener listener,
- {bool lazyAssignmentOperators: false}) {
+ analyzer.Token scanWithListener(String source, ErrorListener listener) {
// Process the source similar to
// pkg/analyzer/lib/src/dart/scanner/scanner.dart
// to simulate replacing the analyzer scanner
- fasta.ScannerResult result = fasta.scanString(source,
- includeComments: true,
- scanLazyAssignmentOperators: lazyAssignmentOperators,
+ fasta.ScannerResult result = fasta.scanString(source, includeComments: true,
recover: ((List<int> bytes, fasta.Token tokens, List<int> lineStarts) {
// perform recovery as a separate step
// so that the token stream can be validated before and after recovery
@@ -200,10 +197,9 @@
]);
}
- analyzer.Token _scan(String source, {bool lazyAssignmentOperators: false}) {
+ analyzer.Token _scan(String source) {
ErrorListener listener = new ErrorListener();
- analyzer.Token token = scanWithListener(source, listener,
- lazyAssignmentOperators: lazyAssignmentOperators);
+ analyzer.Token token = scanWithListener(source, listener);
listener.assertNoErrors();
return token;
}
diff --git a/pkg/front_end/test/scanner_test.dart b/pkg/front_end/test/scanner_test.dart
index 3a0bf75..36b1477 100644
--- a/pkg/front_end/test/scanner_test.dart
+++ b/pkg/front_end/test/scanner_test.dart
@@ -79,8 +79,7 @@
}
abstract class ScannerTestBase {
- Token scanWithListener(String source, ErrorListener listener,
- {bool lazyAssignmentOperators: false});
+ Token scanWithListener(String source, ErrorListener listener);
void test_ampersand() {
_assertToken(TokenType.AMPERSAND, "&");
@@ -92,8 +91,7 @@
void test_ampersand_ampersand_eq() {
if (AbstractScanner.LAZY_ASSIGNMENT_ENABLED) {
- _assertToken(TokenType.AMPERSAND_AMPERSAND_EQ, "&&=",
- lazyAssignmentOperators: true);
+ _assertToken(TokenType.AMPERSAND_AMPERSAND_EQ, "&&=");
}
}
@@ -152,7 +150,7 @@
void test_bar_bar_eq() {
if (AbstractScanner.LAZY_ASSIGNMENT_ENABLED) {
- _assertToken(TokenType.BAR_BAR_EQ, "||=", lazyAssignmentOperators: true);
+ _assertToken(TokenType.BAR_BAR_EQ, "||=");
}
}
@@ -1326,11 +1324,9 @@
* Assert that the token scanned from the given [source] has the
* [expectedType].
*/
- Token _assertToken(TokenType expectedType, String source,
- {bool lazyAssignmentOperators: false}) {
+ Token _assertToken(TokenType expectedType, String source) {
// Fasta generates errors for unmatched '{', '[', etc
- Token originalToken = _scan(source,
- lazyAssignmentOperators: lazyAssignmentOperators, ignoreErrors: true);
+ Token originalToken = _scan(source, ignoreErrors: true);
expect(originalToken, isNotNull);
expect(originalToken.type, expectedType);
expect(originalToken.offset, 0);
@@ -1342,8 +1338,7 @@
return originalToken;
} else if (expectedType == TokenType.SINGLE_LINE_COMMENT) {
// Adding space to an end-of-line comment changes the comment.
- Token tokenWithSpaces = _scan(" $source",
- lazyAssignmentOperators: lazyAssignmentOperators, ignoreErrors: true);
+ Token tokenWithSpaces = _scan(" $source", ignoreErrors: true);
expect(tokenWithSpaces, isNotNull);
expect(tokenWithSpaces.type, expectedType);
expect(tokenWithSpaces.offset, 1);
@@ -1352,23 +1347,20 @@
return originalToken;
} else if (expectedType == TokenType.INT ||
expectedType == TokenType.DOUBLE) {
- Token tokenWithLowerD = _scan("${source}d",
- lazyAssignmentOperators: lazyAssignmentOperators, ignoreErrors: true);
+ Token tokenWithLowerD = _scan("${source}d", ignoreErrors: true);
expect(tokenWithLowerD, isNotNull);
expect(tokenWithLowerD.type, expectedType);
expect(tokenWithLowerD.offset, 0);
expect(tokenWithLowerD.length, source.length);
expect(tokenWithLowerD.lexeme, source);
- Token tokenWithUpperD = _scan("${source}D",
- lazyAssignmentOperators: lazyAssignmentOperators, ignoreErrors: true);
+ Token tokenWithUpperD = _scan("${source}D", ignoreErrors: true);
expect(tokenWithUpperD, isNotNull);
expect(tokenWithUpperD.type, expectedType);
expect(tokenWithUpperD.offset, 0);
expect(tokenWithUpperD.length, source.length);
expect(tokenWithUpperD.lexeme, source);
}
- Token tokenWithSpaces = _scan(" $source ",
- lazyAssignmentOperators: lazyAssignmentOperators, ignoreErrors: true);
+ Token tokenWithSpaces = _scan(" $source ", ignoreErrors: true);
expect(tokenWithSpaces, isNotNull);
expect(tokenWithSpaces.type, expectedType);
expect(tokenWithSpaces.offset, 1);
@@ -1407,11 +1399,9 @@
expect(token.type, TokenType.EOF);
}
- Token _scan(String source,
- {bool lazyAssignmentOperators: false, bool ignoreErrors: false}) {
+ Token _scan(String source, {bool ignoreErrors: false}) {
ErrorListener listener = new ErrorListener();
- Token token = scanWithListener(source, listener,
- lazyAssignmentOperators: lazyAssignmentOperators);
+ Token token = scanWithListener(source, listener);
if (!ignoreErrors) {
listener.assertNoErrors();
}
