Changeset 23 for sizechecking/branches/macs/Ops.hs

Timestamp:

May 3, 2014, 5:01:55 PM (11 years ago)

Author:

gobi

Message:

expression

File:

• sizechecking/branches/macs/Ops.hs (modified) (3 diffs)

sizechecking/branches/macs/Ops.hs

@@ -10 +10 @@
 class (Lambda l) => LOps l where
     infixop :: String -> Int -> (a -> b -> c) -> l a -> l b -> l c
+    infixopr :: String -> Int -> (a -> b -> c) -> l a -> l b -> l c
+    infixopl :: String -> Int -> (a -> b -> c) -> l a -> l b -> l c
     fun :: String -> a -> l a
 
     (+) :: l Int -> l Int -> l Int
-    (+) = infixop "+" 4 (Prelude.+)
+    (+) = infixopl "+" 6 (Prelude.+)
 
     (-) :: l Int -> l Int -> l Int
-    (-) = infixop "-" 4 (Prelude.-)
+    (-) = infixopl "-" 6 (Prelude.-)
 
     (*) :: l Int -> l Int -> l Int
-    (*) = infixop "*" 5 (Prelude.*)
+    (*) = infixopl "*" 7 (Prelude.*)
 
 
 instance LOps Q where
-    infixop _ _ f lhs rhs = Q (eval lhs `f` eval rhs)
+    infixopl _ _ f lhs rhs = Q (eval lhs `f` eval rhs)
+    infixop  _ _ f lhs rhs = Q (eval lhs `f` eval rhs)
+    infixopr _ _ f lhs rhs = Q (eval lhs `f` eval rhs)
     fun _ = Q
 
@@ -29 +33 @@
     fun name _ = S (\_ p -> Prelude.showsPrec p name)
 
-    infixop name prec _ lhs rhs = S(\s p ->
+    infixopl name prec _ lhs rhs = S(\s p ->
         let (s1, s2) = S.split2 s
         in Prelude.showParen (p Prelude.> prec) $
@@ -36 +40 @@
             unS rhs s2 (Prelude.succ prec)
         )
+    infixop name prec _ lhs rhs = S(\s p ->
+        let (s1, s2) = S.split2 s
+        in Prelude.showParen (p Prelude.> prec) $
+            unS lhs s1 (Prelude.succ prec) .
+            Prelude.showString name .
+            unS rhs s2 (Prelude.succ prec)
+        )
+    infixopr name prec _ lhs rhs = S(\s p ->
+        let (s1, s2) = S.split2 s
+        in Prelude.showParen (p Prelude.> prec) $
+            unS lhs s1 (Prelude.succ prec) .
+            Prelude.showString name .
+            unS rhs s2 prec
+        )