Changeset 28

Timestamp:

May 14, 2014, 10:44:07 PM (11 years ago)

Author:

gobi

Message:

cleanup

Location:

sizechecking/branches/macs

Files:

• Proof.hs (added)
• Size.hs (modified) (1 diff)
• SizedFun.hs (modified) (2 diffs)
• Tests/ProofTest.hs (added)
• Tests/SizedFunTest.hs (moved) (moved from sizechecking/branches/macs/Tests/BindTest.hs) (1 diff)

sizechecking/branches/macs/Size.hs

@@ -18 +18 @@
     unsized :: l Unsized
     bottom :: l a
-
 
 instance SContext s => Size (S s) where

sizechecking/branches/macs/SizedFun.hs

@@ -11 +11 @@
 import qualified Data.Supply as S
 import Data.Lens.Light
+import Control.Monad.IO.Class
+
 
 class Infer a b where
 instance (Infer a b, Infer p q) => Infer (a->p) (b->q)
 instance Infer a b => Infer [a] [b]
-instance (a~b) => Infer a b
+instance a~b => Infer a b
 instance Infer Unsized Int
 
@@ -53 +55 @@
 
 instance SizedFun Q where
-    type SizeExp Q = S SBData
+    type SizeExp Q = S SData
     bind name size exp = exp
 
-data DeclSize b where
-  DeclSize :: Infer a b => S SData a -> DeclSize b
-
-instance Lambda DeclSize where
-instance LOps DeclSize where
-instance Exp DeclSize where
-instance SizedFun DeclSize where
-    type SizeExp DeclSize = S SData
-    bind name size exp = DeclSize size
-
---getDeclSize (DeclSize size) = size

sizechecking/branches/macs/Tests/SizedFunTest.hs

@@ -1 +1 @@
 {-# LANGUAGE NoMonomorphismRestriction #-}
 
-module Tests.BindTest where
+module Tests.SizedFunTest where
 
 import Lambda