Changeset 20 for sizechecking/branches/macs/Lambda.hs

Timestamp:

May 2, 2014, 1:59:29 PM (11 years ago)

Author:

gobi

Message:

lint and cleanup

File:

• sizechecking/branches/macs/Lambda.hs (modified) (2 diffs)

sizechecking/branches/macs/Lambda.hs

@@ -21 +21 @@
     const = Q
     lam a = Q (unQ.a.Q)
-    app a b = Q $ (unQ a) (unQ b)
+    app a b = Q $ unQ a (unQ b)
 
+eval :: Q a -> a
 eval = unQ
-
-instance Num a => Num (Q a) where
-    (Q a) + (Q b) = Q (a+b)
-    (Q a) - (Q b) = Q (a-b)
-    (Q a) * (Q b) = Q (a*b)
-    abs (Q a) = Q (abs a)
-
 
 {-
  - show interpreter
  -}
+showVar :: Int -> String -> String
 showVar x = if x>28 
     then showVar (x `div` 29) . showChar (C.chr $ C.ord 'a' + (x `mod` 29))
     else showChar $ C.chr $ C.ord 'a' + x
 
+-- unS :: Value supply -> Precedence -> ShowS
 newtype S a = S { unS :: S.Supply Int -> Int -> ShowS }
+
 instance Lambda S where
-    const a = S (\s p -> flip showsPrec a p)
+    const a = S (\_ p -> showsPrec p a)
     app (S fun) (S arg) = S (\s p -> 
         let (s1, s2) = S.split2 s 
@@ -51 +48 @@
         in showParen (p>0) $ showChar 'λ' . showVar v . showChar '.' . unS (fun showV) s2 0)
 
+ast :: S a -> IO ShowS
 ast a = do
     s <- S.newSupply 0 (+1)
     return $ unS a s 0
 
-printAst a = ast a >>= (\a -> putStrLn $ a "")
-
+printAst :: S a -> IO ()
+printAst l = ast l >>= (\s -> putStrLn $ s "")