Changeset 21 for sizechecking/branches/macs

Timestamp:

May 2, 2014, 3:10:50 PM (11 years ago)

Author:

gobi

Message:

operators

Location:

sizechecking/branches/macs

Files:

• Ops.hs (modified) (1 diff)
• tests/LambdaTest.hs (modified) (1 diff)
• tests/Main.hs (added)
• tests/OpsTest.hs (added)

sizechecking/branches/macs/Ops.hs

@@ +1 @@
+{-# LANGUAGE FlexibleInstances #-}
+
 module Ops where
 
+import qualified Data.Supply as S
+import Prelude (String, Int, ($), (.))
+import qualified Prelude
 import Lambda
+
+class (Lambda l) => LOps l where
+    infixop :: 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.+)
+
+    (-) :: l Int -> l Int -> l Int
+    (-) = infixop "-" 4 (Prelude.-)
+
+    (*) :: l Int -> l Int -> l Int
+    (*) = infixop "*" 5 (Prelude.*)
+
+
+instance LOps Q where
+    infixop _ _ f lhs rhs = Q (eval lhs `f` eval rhs)
+    fun _ = Q
+
+instance LOps S where
+    fun name _ = S (\_ p -> Prelude.showsPrec p name)
+
+    infixop name prec _ lhs rhs = S(\s p ->
+        let (s1, s2) = S.split2 s
+        in Prelude.showParen (p Prelude.> prec) $
+            unS lhs s1 prec .
+            Prelude.showString name .
+            unS rhs s2 (Prelude.succ prec)
+        )

sizechecking/branches/macs/tests/LambdaTest.hs

@@ -1 +1 @@
 {-# LANGUAGE NoMonomorphismRestriction #-}
 
+module Tests.LambdaTest where
+
 import Lambda
-import Ops
-import Prelude ( ($), Int )
+import Prelude ( ($), Int, (==), return, sequence, (>>=), and, (.), IO, Bool )
+import qualified Control.Monad
 
 test1 :: (Lambda l) => l Int
 test1 = app (lam $ \_ -> const 3) (const 2)
 
+test1ast :: IO Bool
+test1ast = do
+    t <- ast test1
+    return $ t "" == "(λa.3) 2"
 
+test1eval :: IO Bool
+test1eval = return $ eval test1 == 3
+
+tests :: [IO Bool]
+tests = [ 
+      test1ast
+    , test1eval
+    ]
+
+runTests :: IO Bool
+runTests = Control.Monad.liftM and $ sequence tests