commit 7ec462110813b81c538a14a51b4fc16fba56aadb
author danrubel <danrubel@google.com> Sat May 04 17:14:46 2019 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Sat May 04 17:14:46 2019 +0000
tree e1faca4a941e6acda55aa724dfffecc934f395f7
parent 81ced1c9bf97270f96c751fb6cba89dc3caf8810

cleanup scanner configuration flags

* rename enableGtGtGt to enableTripleShift
* remove unused enableGtGtGtEq field

Change-Id: I0fa881c45619067ec3a292acbff984db555aa43e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/101362
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Dan Rubel <danrubel@google.com>

pkg/analyzer/lib/src/dart/scanner/scanner.dart

diff --git a/pkg/analyzer/lib/src/dart/scanner/scanner.dart b/pkg/analyzer/lib/src/dart/scanner/scanner.dart
index 566caf2..5c52bca 100644
--- a/pkg/analyzer/lib/src/dart/scanner/scanner.dart
+++ b/pkg/analyzer/lib/src/dart/scanner/scanner.dart
@@ -55,13 +55,18 @@
   bool scanLazyAssignmentOperators = false;
 
   /**
-   * A flag indicating whether the scanner should recognize the `>>>` operator.
+   * A flag indicating whether the scanner should recognize the `>>>` operator
+   * and the `>>>=` operator.
+   *
+   * Use [configureFeatures] rather than this field.
    */
   bool enableGtGtGt = false;
 
   /**
    * A flag indicating whether the scanner should recognize the `late` and
    * `required` keywords.
+   *
+   * Use [configureFeatures] rather than this field.
    */
   bool enableNonNullable = false;
 
@@ -122,7 +127,8 @@
   Token tokenize() {
     fasta.ScannerResult result = fasta.scanString(_contents,
         configuration: fasta.ScannerConfiguration(
-            enableGtGtGt: enableGtGtGt, enableNonNullable: enableNonNullable),
+            enableTripleShift: enableGtGtGt,
+            enableNonNullable: enableNonNullable),
         includeComments: _preserveComments,
         scanLazyAssignmentOperators: scanLazyAssignmentOperators);
 
@@ -157,7 +163,6 @@
       featureSet == null
           ? fasta.ScannerConfiguration()
           : fasta.ScannerConfiguration(
-              enableGtGtGt: featureSet.isEnabled(Feature.triple_shift),
-              enableGtGtGtEq: featureSet.isEnabled(Feature.triple_shift),
+              enableTripleShift: featureSet.isEnabled(Feature.triple_shift),
               enableNonNullable: featureSet.isEnabled(Feature.non_nullable));
 }

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 8df047a..637bbc1 100644
--- a/pkg/front_end/lib/src/fasta/scanner/abstract_scanner.dart
+++ b/pkg/front_end/lib/src/fasta/scanner/abstract_scanner.dart
@@ -54,7 +54,7 @@
   /// Experimental flag for enabling scanning of `>>>`.
   /// See https://github.com/dart-lang/language/issues/61
   /// and https://github.com/dart-lang/language/issues/60
-  bool _enableGtGtGt = false;
+  bool _enableTripleShift = false;
 
   /// Experimental flag for enabling scanning of NNBD tokens
   /// such as 'required' and 'late'.
@@ -109,7 +109,7 @@
   set configuration(ScannerConfiguration config) {
     if (config != null) {
       _enableNonNullable = config.enableNonNullable;
-      _enableGtGtGt = config.enableGtGtGt;
+      _enableTripleShift = config.enableTripleShift;
     }
   }
 
@@ -708,9 +708,9 @@
       if (identical($EQ, next)) {
         appendPrecedenceToken(TokenType.GT_GT_EQ);
         return advance();
-      } else if (_enableGtGtGt && identical($GT, next)) {
+      } else if (_enableTripleShift && identical($GT, next)) {
         next = advance();
-        if (_enableGtGtGt && identical($EQ, next)) {
+        if (_enableTripleShift && identical($EQ, next)) {
           appendPrecedenceToken(TokenType.GT_GT_GT_EQ);
           return advance();
         }
@@ -1540,18 +1540,11 @@
   /// Experimental flag for enabling scanning of `>>>`.
   /// See https://github.com/dart-lang/language/issues/61
   /// and https://github.com/dart-lang/language/issues/60
-  final bool enableGtGtGt;
-
-  /// Experimental flag for enabling scanning of `>>>=`.
-  /// See https://github.com/dart-lang/language/issues/61
-  /// and https://github.com/dart-lang/language/issues/60
-  final bool enableGtGtGtEq;
+  final bool enableTripleShift;
 
   const ScannerConfiguration({
-    bool enableGtGtGt,
-    bool enableGtGtGtEq,
+    bool enableTripleShift,
     bool enableNonNullable,
-  })  : this.enableGtGtGt = enableGtGtGt ?? false,
-        this.enableGtGtGtEq = enableGtGtGtEq ?? false,
+  })  : this.enableTripleShift = enableTripleShift ?? false,
         this.enableNonNullable = enableNonNullable ?? false;
 }

pkg/front_end/test/fasta/parser/type_info_test.dart

diff --git a/pkg/front_end/test/fasta/parser/type_info_test.dart b/pkg/front_end/test/fasta/parser/type_info_test.dart
index 6adff9e..b100668 100644
--- a/pkg/front_end/test/fasta/parser/type_info_test.dart
+++ b/pkg/front_end/test/fasta/parser/type_info_test.dart
@@ -33,8 +33,7 @@
 ScannerResult scanString(String source,
         {bool includeComments: false, Recover recover}) =>
     scanner.scanString(source,
-        configuration: const ScannerConfiguration(
-            enableGtGtGt: true, enableGtGtGtEq: true),
+        configuration: const ScannerConfiguration(enableTripleShift: true),
         includeComments: includeComments,
         recover: recover);