Merge pull request purescript#874 from purescript/modulosemiring

garyb · garyb · commit aae1a071880e · 2015-02-16T00:51:54.000Z
Relax `ModuloRing` to `ModuloSemiring`
diff --git a/prelude/README.md b/prelude/README.md
@@ -64,7 +64,7 @@
 Ring where every nonzero element has a multiplicative inverse (possibly
 a non-commutative field) so that ```a `mod` b = zero```
 
-    class (ModuloRing a) <= DivisionRing a where
+    class (Ring a, ModuloSemiring a) <= DivisionRing a where
 
 #### `Eq`
 
@@ -77,12 +77,12 @@ a non-commutative field) so that ```a `mod` b = zero```
     class Functor f where
       (<$>) :: forall a b. (a -> b) -> f a -> f b
 
-#### `ModuloRing`
+#### `ModuloSemiring`
 
-Ring with modulo operation and division where
+Semiring with modulo operation and division where
 ```a / b * b + (a `mod` b) = a```
 
-    class (Ring a) <= ModuloRing a where
+    class (Semiring a) <= ModuloSemiring a where
       (/) :: a -> a -> a
       mod :: a -> a -> a
 
@@ -192,9 +192,9 @@ Addition and multiplication
 
     instance functorArr :: Functor (Prim.Function r)
 
-#### `moduloRingNumber`
+#### `moduloSemiringNumber`
 
-    instance moduloRingNumber :: ModuloRing Number
+    instance moduloSemiringNumber :: ModuloSemiring Number
 
 #### `monadArr`
 
diff --git a/prelude/images/Prelude.png b/prelude/images/Prelude.png
diff --git a/prelude/prelude.purs b/prelude/prelude.purs
@@ -14,10 +14,10 @@ module Prelude
   , Bind, (>>=)
   , Monad, return, liftM1, ap
   , Semiring, (+), zero, (*), one
+  , ModuloSemiring, (/), mod
   , Ring, (-)
   , (%)
   , negate
-  , ModuloRing, (/), mod
   , DivisionRing
   , Num
   , Eq, (==), (/=), refEq, refIneq
@@ -217,22 +217,22 @@ module Prelude
     (*)  :: a -> a -> a
     one  :: a
 
+  -- | Semiring with modulo operation and division where
+  -- | ```a / b * b + (a `mod` b) = a```
+  class (Semiring a) <= ModuloSemiring a where
+    (/) :: a -> a -> a
+    mod :: a -> a -> a
+
   -- | Addition, multiplication, and subtraction
   class (Semiring a) <= Ring a where
     (-) :: a -> a -> a
 
   negate :: forall a. (Ring a) => a -> a
   negate a = zero - a
 
-  -- | Ring with modulo operation and division where
-  -- | ```a / b * b + (a `mod` b) = a```
-  class (Ring a) <= ModuloRing a where
-    (/) :: a -> a -> a
-    mod :: a -> a -> a
-
   -- | Ring where every nonzero element has a multiplicative inverse (possibly
   -- | a non-commutative field) so that ```a `mod` b = zero```
-  class (ModuloRing a) <= DivisionRing a
+  class (Ring a, ModuloSemiring a) <= DivisionRing a
 
   -- | A commutative field
   class (DivisionRing a) <= Num a
@@ -293,7 +293,7 @@ module Prelude
   instance ringNumber :: Ring Number where
     (-) = numSub
 
-  instance moduloRingNumber :: ModuloRing Number where
+  instance moduloSemiringNumber :: ModuloSemiring Number where
     (/) = numDiv
     mod _ _ = 0
 
diff --git a/src/Language/PureScript/CodeGen/JS/Optimizer/Inliner.hs b/src/Language/PureScript/CodeGen/JS/Optimizer/Inliner.hs
@@ -105,7 +105,7 @@ inlineCommonOperators = applyAll $
   , binary C.semiringNumber (C.*) Multiply
   , binary C.ringNumber (C.-) Subtract
   , unary  C.ringNumber C.negate Negate
-  , binary C.moduloRingNumber (C./) Divide
+  , binary C.moduloSemiringNumber (C./) Divide
 
   , binary C.ordNumber (C.<) LessThan
   , binary C.ordNumber (C.>) GreaterThan
diff --git a/src/Language/PureScript/Constants.hs b/src/Language/PureScript/Constants.hs
@@ -175,8 +175,8 @@ semiringNumber = "semiringNumber"
 ringNumber :: String
 ringNumber = "ringNumber"
 
-moduloRingNumber :: String
-moduloRingNumber = "moduloRingNumber"
+moduloSemiringNumber :: String
+moduloSemiringNumber = "moduloSemiringNumber"
 
 numNumber :: String
 numNumber = "numNumber"
