X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=sem.dcl;h=a2bcd572e08683f42b0d5d8d953dc98c4157a8c7;hb=b2e209f5c3b3d334dde4c93e8e86f4334428e802;hp=be207dd4a4d89183238b337dea0cdd3186a53cda;hpb=c270b0fc79caa24c08c2d00c2e8205bbd47921ed;p=cc1516.git

diff --git a/sem.dcl b/sem.dcl
index be207dd..a2bcd57 100644
--- a/sem.dcl
+++ b/sem.dcl
@@ -1,10 +1,19 @@
 definition module sem
 
+import qualified Data.Map as Map
 from Data.Either import :: Either
-from AST import :: AST
-from lex import :: Error
-from parse import :: ParserOutput
+from AST import :: AST, :: Pos, :: Type
+from StdOverloaded import class toString
 
-:: SemOutput :== Either Error AST
+:: SemError 
+	= ParseError Pos String 
+	| UnifyError Pos Type Type 
+	| UnifyErrorStub Type Type 
+	| Error String
+:: Gamma
+:: SemOutput :== Either [SemError] (AST, Gamma)
 
-sem :: ParserOutput -> SemOutput
+instance toString SemError
+instance toString Gamma
+
+sem :: AST -> SemOutput