Merge branch 'compiler/0.12' into records

Author: garyb

src/Data/EuclideanRing.js

@@ -8,30 +8,19 @@ exports.intDegree = function (x) {
 // https://en.m.wikipedia.org/wiki/Modulo_operation.
 exports.intDiv = function (x) {
   return function (y) {
+    if (y == 0) return 0;
     return y > 0 ? Math.floor(x / y) : -Math.floor(x / -y);
   };
 };
 
-exports.quot = function (x) {
-  return function (y) {
-    /* jshint bitwise: false */
-    return x / y | 0;
-  };
-};
-
 exports.intMod = function (x) {
   return function (y) {
+    if (y == 0) return 0;
     var yy = Math.abs(y);
     return ((x % yy) + yy) % yy;
   };
 };
 
-exports.rem = function (x) {
-  return function (y) {
-    return x % y;
-  };
-};
-
 exports.numDiv = function (n1) {
   return function (n2) {
     return n1 / n2;

src/Data/EuclideanRing.purs

@@ -2,13 +2,9 @@ module Data.EuclideanRing
   ( class EuclideanRing, degree, div, mod, (/)
   , gcd
   , lcm
-  , quot
-  , rem
   , module Data.CommutativeRing
   , module Data.Ring
   , module Data.Semiring
-  , intDiv
-  , intMod
   ) where
 
 import Data.BooleanAlgebra ((||))
@@ -100,38 +96,3 @@ lcm a b =
   if a == zero || b == zero
     then zero
     else a * b / gcd a b
-
--- | The `quot` function provides _truncating_ integer division (see the
--- | documentation for the `EuclideanRing` class). It is identical to `div` in
--- | the `EuclideanRing Int` instance if the dividend is positive, but will be
--- | slightly different if the dividend is negative. For example:
--- |
--- | ```purescript
--- | div 2 3 == 0
--- | quot 2 3 == 0
--- |
--- | div (-2) 3 == (-1)
--- | quot (-2) 3 == 0
--- |
--- | div 2 (-3) == 0
--- | quot 2 (-3) == 0
--- | ```
-foreign import quot :: Int -> Int -> Int
-
--- | The `rem` function provides the remainder after _truncating_ integer
--- | division (see the documentation for the `EuclideanRing` class). It is
--- | identical to `mod` in the `EuclideanRing Int` instance if the dividend is
--- | positive, but will be slightly different if the dividend is negative. For
--- | example:
--- |
--- | ```purescript
--- | mod 2 3 == 2
--- | rem 2 3 == 2
--- |
--- | mod (-2) 3 == 1
--- | rem (-2) 3 == (-2)
--- |
--- | mod 2 (-3) == 2
--- | rem 2 (-3) == 2
--- | ```
-foreign import rem :: Int -> Int -> Int

src/Prelude.purs

@@ -41,7 +41,7 @@ import Data.Bounded (class Bounded, bottom, top)
 import Data.CommutativeRing (class CommutativeRing)
 import Data.DivisionRing (class DivisionRing, recip)
 import Data.Eq (class Eq, eq, notEq, (/=), (==))
-import Data.EuclideanRing (class EuclideanRing, degree, div, mod, quot, rem, (/), gcd, lcm)
+import Data.EuclideanRing (class EuclideanRing, degree, div, mod, (/), gcd, lcm)
 import Data.Field (class Field)
 import Data.Function (const, flip, ($), (#))
 import Data.Functor (class Functor, flap, map, void, ($>), (<#>), (<$), (<$>), (<@>))

test/Test/Main.purs

@@ -1,7 +1,6 @@
 module Test.Main where
 
 import Prelude
-import Data.EuclideanRing (intDiv, intMod)
 import Data.HeytingAlgebra (ff, tt, implies)
 import Data.Ord (abs)
 
@@ -13,7 +12,6 @@ main = do
     testOrderings
     testOrdUtils
     testIntDivMod
-    testIntQuotRem
     testIntDegree
     testRecordInstances
 
@@ -33,10 +31,6 @@ testOrd x y ord =
 nan :: Number
 nan = 0.0/0.0
 
--- Unfortunately, NaN inhabits our Int
-intNan :: Int
-intNan = mod 1 0
-
 plusInfinity :: Number
 plusInfinity = 1.0/0.0
 
@@ -64,7 +58,8 @@ testOrderings = do
     assert "NaN > 1 should be false" $ (nan > 1.0) == false
     assert "NaN < 1 should be false" $ (nan < 1.0) == false
     assert "NaN == 1 should be false" $ nan /= 1.0
-    testOrd intNan 2147483647 GT
+    testOrd (1 / 0) 0 EQ
+    testOrd (mod 1 0) 0 EQ
     testOrd 'a' 'b' LT
     testOrd 'b' 'A' GT
     testOrd "10" "0" GT
@@ -105,39 +100,15 @@ testIntDivMod = do
   where
   go a b =
     let
-      q = intDiv a b
-      r = intMod a b
+      q = a / b
+      r = a `mod` b
       msg = show a <> " / " <> show b <> ": "
     in do
       assert (msg <> "Quotient/remainder law") $
         q * b + r == a
       assert (msg <> "Remainder should be between 0 and `abs b`, got: " <> show r) $
         0 <= r && r < abs b
 
-testIntQuotRem :: AlmostEff
-testIntQuotRem = do
-  -- Check when dividend goes into divisor exactly
-  go 8 2
-  go (-8) 2
-  go 8 (-2)
-  go (-8) (-2)
-
-  -- Check when dividend does not go into divisor exactly
-  go 2 3
-  go (-2) 3
-  go 2 (-3)
-  go (-2) (-3)
-
-  where
-  go a b =
-    let
-      q = quot a b
-      r = rem a b
-      msg = show a <> " / " <> show b <> ": "
-    in do
-      assert (msg <> "Quotient/remainder law") $
-        q * b + r == a
-
 testIntDegree :: AlmostEff
 testIntDegree = do
     let bot = bottom :: Int