Make operator precedence in the Prelude match Haskell purescript#176

paf31 · paf31 · commit 6fd0295d026c · 2014-02-06T14:43:03.000-08:00
diff --git a/examples/passing/Eff.purs b/examples/passing/Eff.purs
@@ -24,4 +24,4 @@ import TestEff
 main = do
   n <- test1
   Trace.print n
-  --Trace.print test2
+  Trace.print test2
diff --git a/libraries/prelude/prelude.purs b/libraries/prelude/prelude.purs
@@ -12,8 +12,8 @@ module Prelude where
   konst :: forall a b. a -> b -> a
   konst a _ = a
 
-  infixr 5 >>>
-  infixr 5 <<<
+  infixr 9 >>>
+  infixr 9 <<<
 
   class Category a where
     id :: forall t. a t t
@@ -25,8 +25,8 @@ module Prelude where
     (<<<) f g x = f (g x)
     (>>>) f g x = g (f x)
 
-  infixr 1000 $
-  infixl 1000 #
+  infixr 0 $
+  infixl 0 #
 
   ($) :: forall a b. (a -> b) -> a -> b
   ($) f x = f x
@@ -92,12 +92,12 @@ module Prelude where
       a' <- a
       ret (f' a')
 
-  infixl 5 *
-  infixl 5 /
-  infixl 5 %
+  infixl 7 *
+  infixl 7 /
+  infixl 7 %
 
-  infixl 7 -
-  infixl 7 +
+  infixl 6 -
+  infixl 6 +
 
   class Num a where
     (+) :: a -> a -> a
@@ -149,8 +149,8 @@ module Prelude where
     (%) = numMod
     negate = numNegate
 
-  infixl 9 ==
-  infixl 9 /=
+  infixl 4 ==
+  infixl 4 /=
 
   class Eq a where
     (==) :: a -> a -> Boolean
@@ -205,10 +205,10 @@ module Prelude where
     (==) _ _ = false
     (/=) xs ys = not (xs == ys)
 
-  infixl 3 <
-  infixl 3 >
-  infixl 3 <=
-  infixl 3 >=
+  infixl 4 <
+  infixl 4 >
+  infixl 4 <=
+  infixl 4 >=
 
   class Ord a where
     (<) :: a -> a -> Boolean
@@ -308,16 +308,16 @@ module Prelude where
     zshr = numZshr
     complement = numComplement
 
-  infixl 4 !!
+  infixl 8 !!
 
   foreign import (!!) "function $bang$bang(xs) {\
                       \  return function(n) {\
                       \    return xs[n];\
                       \  };\
                       \}" :: forall a. [a] -> Number -> a
 
-  infixr 11 ||
-  infixr 11 &&
+  infixr 2 ||
+  infixr 3 &&
 
   class BoolLike b where
     (&&) :: b -> b -> b
@@ -345,7 +345,7 @@ module Prelude where
     (||) = boolOr
     not = boolNot
 
-  infixr 6 ++
+  infixr 5 ++
 
   foreign import (++) "function $plus$plus(s1) {\
                       \  return function(s2) {\
diff --git a/src/Language/PureScript/Sugar/Operators.hs b/src/Language/PureScript/Sugar/Operators.hs
@@ -60,7 +60,7 @@ customOperatorTable fixities =
   let
     applyUserOp name t1 t2 = App (App (Var name) t1) t2
     userOps = map (\(name, Fixity a p) -> (name, applyUserOp name, p, a)) . M.toList $ fixities
-    sorted = sortBy (compare `on` (\(_, _, p, _) -> p)) userOps
+    sorted = reverse $ sortBy (compare `on` (\(_, _, p, _) -> p)) userOps
     groups = groupBy ((==) `on` (\(_, _, p, _) -> p)) sorted
   in
     map (map (\(name, f, _, a) -> (name, f, a))) groups
