Revert "Revert "Allow patch files to add top-level declarations to the patched library.""

corelib/unified/math/base.dart

 // Copyright (c) 2012, 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.
 
 // A part of the dart:math library.
 
 /**
  * Base of the natural logarithms.
  */
 final double E = 2.718281828459045;
@@ skipping 38 matching lines @@
  * [FormatException] if [str] cannot be parsed as an [int].
  */
 external int parseInt(String str);
 
 /**
  * Parses a [String] representation of a [double], and returns a [double].
  * Throws a [FormatException] if [str] cannot be parsed as a [double].
  */
 external double parseDouble(String str);
 
+/**
+  * Returns the minimum of two numbers. If either argument is NaN returns NaN.
+  * The minimum of [:-0.0:] and [:0.0:] is [:-0.0:]. If both arguments are
+  * equal (int and doubles with the same mathematical value are equal) then
+  * it is unspecified which of the two arguments is returned.
+  */
 num min(num a, num b) {
-  int c = a.compareTo(b);
-  if (c == 0) return a;
-  if (c < 0) {
-    if ((b is double) && b.isNaN()) return b;
-    return a;
+  if (a is num) {
+    // TODO(floitsch): merge this if into the previous one, once dart2js
+    // correctly propagates types for logical ands.
+    if (b is num) {
+      if (a > b) return b;
+      if (a < b) return a;
+      if (b is double) {
+        // Special case for NaN and -0.0. If one argument is NaN return NaN.
+        // [min] must also distinguish between -0.0 and 0.0.
+        if (a is double) {
+          if (a == 0.0) {
+            // a is either 0.0 or -0.0. b is either 0.0, -0.0 or NaN.
+            // The following returns -0.0 if either a or b is -0.0, and it
+            // returns NaN if b is NaN.
+            return (a + b) * a * b;
+          }
+        }
+        // Check for NaN and b == -0.0.
+        if (a == 0 && b.isNegative() || b.isNaN()) return b;
+        return a;
+      }
+      return a;
+    }
+    throw new IllegalArgumentException(b);
   }
-  if ((a is double) && a.isNaN()) return a;
-  return b;
-}
-
-num max(num a, num b) {
-  // NaNs are handled correctly since the compareTo function always considers
-  // them to be bigger than any other operand.
-  return (a.compareTo(b) < 0) ? b : a;
+  throw new IllegalArgumentException(a);
 }
 
 /**
+  * Returns the maximum of two numbers. If either argument is NaN returns NaN.
+  * The maximum of [:-0.0:] and [:0.0:] is [:0.0:]. If both arguments are
+  * equal (int and doubles with the same mathematical value are equal) then
+  * it is unspecified which of the two arguments is returned.
+  */
+num max(num a, num b) {
+  if (a is num) {
+    // TODO(floitsch): merge this if into the previous one, once dart2js
+    // correctly propagates types for logical ands.
+    if (b is num) {
+      if (a > b) return a;
+      if (a < b) return b;
+      if (b is double) {
+        // Special case for NaN and -0.0. If one argument is NaN return NaN.
+        // [max] must also distinguish between -0.0 and 0.0.
+        if (a is double) {
+          if (a == 0.0) {
+            // a is either 0.0 or -0.0. b is either 0.0, -0.0, or NaN.
+            // The following returns 0.0 if either a or b is 0.0, and it
+            // returns NaN if b is NaN.
+            return a + b;
+          }
+        }
+        // Check for NaN.
+        if (b.isNaN()) return b;
+        return a;
+      }
+      // max(-0.0, 0) must return 0.
+      if (b == 0 && a.isNegative()) return b;
+      return a;
+    }
+    throw new IllegalArgumentException(b);
+  }
+  throw new IllegalArgumentException(a);
+}
+
+/**
  * Returns the arc tangent of [a]/[b] with sign according to quadrant.
  */
 external double atan2(num a, num b);
 
 /**
  * If the [exponent] is an integer the result is of the same type as [x].
  * Otherwise it is a [double].
  */
 external num pow(num x, num exponent);
 
 external double sin(num x);
 external double cos(num x);
 external double tan(num x);
 external double acos(num x);
 external double asin(num x);
 external double atan(num x);
 external double sqrt(num x);
 external double exp(num x);
 external double log(num x);