Merge d2ecd64 into ad706a9

Author: srburton

pkg/analyzer_cli/test/data/sky_engine/lib/core.dart

@@ -34,7 +34,9 @@ abstract class String implements Comparable<String> {
   List<int> get codeUnits;
 }
 
-class bool extends Object {}
+class bool extends Object {
+  static bool parse(String source, {bool caseSensitive = false}) => false;
+}
 
 abstract class num implements Comparable<num> {
   bool operator <(num other);

sdk/lib/_internal/js_dev_runtime/patch/core_patch.dart

@@ -721,6 +721,16 @@ class bool {
         'bool.hasEnvironment can only be used as a const constructor');
   }
 
+  @patch
+  static bool parse(String source, {bool caseSensitive = true}) =>
+      Primitives.parseBool(source, caseSensitive) ??
+      (throw FormatException("Not valid boolean", source));
+
+  @patch
+  static bool? tryParse(String source, {bool caseSensitive = true}) {
+    return Primitives.parseBool(source, caseSensitive);
+  }
+
   @patch
   int get hashCode => super.hashCode;
 

sdk/lib/_internal/js_runtime/lib/core_patch.dart

@@ -582,6 +582,16 @@ class String {
 class bool {
   @patch
   int get hashCode => super.hashCode;
+
+  @patch
+  static bool parse(String source, {bool caseSensitive = true}) =>
+      tryParse(source, caseSensitive: caseSensitive) ??
+      (throw FormatException("Not a valid boolean", source));
+
+  @patch
+  static bool? tryParse(String source, {bool caseSensitive = true}) {
+    return Primitives.parseBool(source, caseSensitive);
+  }
 }
 
 @patch

sdk/lib/_internal/js_runtime/lib/js_helper.dart

@@ -50,6 +50,7 @@ import 'dart:_interceptors';
 import 'dart:_internal' as _symbol_dev;
 import 'dart:_internal'
     show
+        checkNotNullable,
         EfficientLengthIterable,
         MappedIterable,
         IterableElementError,
@@ -381,6 +382,35 @@ class Primitives {
     return result;
   }
 
+  static bool? parseBool(String source, bool caseSensitive) {
+    checkNotNullable(source, "source");
+    checkNotNullable(caseSensitive, "caseSensitive");
+    // The caseSensitive defaults to true.
+    if (caseSensitive) {
+      return source == "true"
+          ? true
+          : source == "false"
+              ? false
+              : null;
+    }
+    // Compare case-sensitive when caseSensitive is false.
+    return _compareIgnoreCase(source, "true")
+        ? true
+        : _compareIgnoreCase(source, "false")
+            ? false
+            : null;
+  }
+
+  static bool _compareIgnoreCase(String input, String lowerCaseTarget) {
+    if (input.length != lowerCaseTarget.length) return false;
+    for (var i = 0; i < input.length; i++) {
+      if (input.codeUnitAt(i) | 0x20 != lowerCaseTarget.codeUnitAt(i)) {
+        return false;
+      }
+    }
+    return true;
+  }
+
   /// [: r"$".codeUnitAt(0) :]
   static const int DOLLAR_CHAR_VALUE = 36;
 

sdk/lib/_internal/vm_shared/lib/bool_patch.dart

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import "dart:_internal" show patch;
+import "dart:_internal" show patch, checkNotNullable;
 
 @patch
 @pragma("vm:entry-point")
@@ -20,4 +20,48 @@ class bool {
   int get hashCode => this ? 1231 : 1237;
 
   int get _identityHashCode => this ? 1231 : 1237;
+
+  @patch
+  static bool parse(String source, {bool caseSensitive = true}) {
+    checkNotNullable(source, "source");
+    // The caseSensitive defaults to true.
+    if (caseSensitive == null || caseSensitive) {
+      return source == "true" ||
+          source != "false" &&
+              (throw FormatException("Not a valid boolean", source));
+    }
+    // Ignore case-sensitive when caseSensitive is false.
+    return _compareIgnoreCase(source, "true") ||
+        !_compareIgnoreCase(source, "false") &&
+            (throw FormatException("Not a valid boolean", source));
+  }
+
+  @patch
+  static bool? tryParse(String source, {bool? caseSensitive}) {
+    checkNotNullable(source, "source");
+    // The caseSensitive defaults to true.
+    if (caseSensitive == null || caseSensitive) {
+      return source == "true"
+          ? true
+          : source == "false"
+              ? false
+              : null;
+    }
+    // Ignore case-sensitive when caseSensitive is false.
+    return _compareIgnoreCase(source, "true")
+        ? true
+        : _compareIgnoreCase(source, "false")
+            ? false
+            : null;
+  }
+
+  static bool _compareIgnoreCase(String input, String lowerCaseTarget) {
+    if (input.length != lowerCaseTarget.length) return false;
+    for (var i = 0; i < input.length; i++) {
+      if (input.codeUnitAt(i) | 0x20 != lowerCaseTarget.codeUnitAt(i)) {
+        return false;
+      }
+    }
+    return true;
+  }
 }

sdk/lib/core/bool.dart

@@ -94,6 +94,43 @@ class bool {
   //ignore: const_factory
   external const factory bool.hasEnvironment(String name);
 
+  /// Parse [source] as an, optionally case-insensitive, boolean literal.
+  ///
+  /// If [caseSensitive] is `true`, which is the default,
+  /// the only accepted inputs are the strings `"true"` and `"false"`.
+  /// 
+  /// If [caseSensitive] is `false`, any combination of upper and lower case 
+  /// ASCII letters in the words `"true"` and `"false"` are accepted, as if the 
+  /// input was first lower-cased.
+  ///
+  /// If the [source] string does not contain a valid boolean literal
+  /// a [FormatException] is thrown.
+  ///
+  /// Rather than throwing and immediately catching the [FormatException],
+  /// instead use [tryParse] to handle a potential parsing error.
+  @Since("3.0")
+  external static bool parse(String source, {bool caseSensitive = true});
+
+  /// Parse [source] as an, optionally case-insensitive, boolean literal.
+  ///
+  /// Like [parse] except that this function returns `null` where a
+  /// similar call to [parse] would throw a [FormatException].
+  ///
+  /// Example:
+  /// ```dart
+  /// print(bool.tryParse('true'));  // true
+  /// print(bool.tryParse('false'));  // false
+  /// print(bool.tryParse('TRUE'));  // null
+  /// print(bool.tryParse('TRUE', caseSensitive: false)); // true
+  /// print(bool.tryParse('FALSE', caseSensitive: false)); // false
+  /// print(bool.tryParse('NO')); // null
+  /// print(bool.tryParse('YES')); // null
+  /// print(bool.tryParse('0')); // null
+  /// print(bool.tryParse('1')); // null
+  /// ```
+  @Since("3.0")
+  external static bool? tryParse(String source, {bool caseSensitive = true});
+
   external int get hashCode;
 
   /// The logical conjunction ("and") of this and [other].

tests/corelib/bool_parse_test.dart

@@ -0,0 +1,23 @@
+// Copyright (c) 2023, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+// SharedOptions=-Da=true -Db=false -Dc=NOTBOOL -Dd=True
+
+import "package:expect/expect.dart";
+
+main() {
+  Expect.isTrue(bool.parse('true'));
+  Expect.isFalse(bool.parse('false'));
+  Expect.isTrue(bool.parse('TRUE', caseSensitive: false));
+  Expect.isFalse(bool.parse('FALSE', caseSensitive: false));
+  Expect.isTrue(bool.parse('true', caseSensitive: true));
+  Expect.isFalse(bool.parse('false', caseSensitive: true));
+  Expect.throws(()=> bool.parse('True'));
+  Expect.throws(()=> bool.parse('False'));
+  Expect.throws(()=> bool.parse('y'));
+  Expect.throws(()=> bool.parse('n'));
+  Expect.throws(()=> bool.parse('0'));
+  Expect.throws(()=> bool.parse('1'));
+  Expect.throws(()=> bool.parse('TRUE', caseSensitive: true));
+  Expect.throws(()=> bool.parse('FALSE', caseSensitive: true));
+}

tests/corelib/bool_try_parse_test.dart

@@ -0,0 +1,21 @@
+// Copyright (c) 2023, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+// SharedOptions=-Da=true -Db=false -Dc=NOTBOOL -Dd=True
+
+import "package:expect/expect.dart";
+
+main() {
+  Expect.isTrue(bool.tryParse('true'));
+  Expect.isFalse(bool.tryParse('false'));
+  Expect.isTrue(bool.tryParse('TRUE', caseSensitive: false));
+  Expect.isFalse(bool.tryParse('FALSE', caseSensitive: false));
+  Expect.isNull(bool.tryParse('TRUE'));
+  Expect.isNull(bool.tryParse('FALSE'));
+  Expect.isNull(bool.tryParse('y'));
+  Expect.isNull(bool.tryParse('n'));
+  Expect.isNull(bool.tryParse(' true ', caseSensitive: false));
+  Expect.isNull(bool.tryParse(' false ', caseSensitive: false));
+  Expect.isNull(bool.tryParse('0', caseSensitive: true));
+  Expect.isNull(bool.tryParse('1', caseSensitive: true));
+}