repositories
/
cc1516.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://github.com/dopefishh/cc1516
[cc1516.git]
/
sem.icl
diff --git
a/sem.icl
b/sem.icl
index
f0241e1
..
992d660
100644
(file)
--- a/
sem.icl
+++ b/
sem.icl
@@
-59,11
+59,11
@@
instance toString SemError where
toString t1, ". Given: ", toString t2]
sem :: AST -> SemOutput
toString t1, ". Given: ", toString t2]
sem :: AST -> SemOutput
-sem (AST vd fd) = case
eval
StateT m ('Map'.newMap, getRandomStream 1) of
+sem (AST vd fd) = case
run
StateT m ('Map'.newMap, getRandomStream 1) of
Left e = Left [e]
Left e = Left [e]
- Right (
vds, fds) = Right (AST vds fds
)
+ Right (
(vds, fds), gamma) = Right ((AST vds fds), gamma
)
where
where
- m :: Env (
([VarDecl], [FunDecl])
)
+ m :: Env (
[VarDecl], [FunDecl]
)
m = (mapM semVarDecl vd) >>= \vds ->
mapM semFunDecl fd >>= \fds ->
pure (vds, fds)
m = (mapM semVarDecl vd) >>= \vds ->
mapM semFunDecl fd >>= \fds ->
pure (vds, fds)
@@
-127,14
+127,15
@@
instance unify Expr where
Right t = Right t //note, t :: (Type, Gamma)
where m = typeExpr e >>= \tex-> unify t tex
Right t = Right t //note, t :: (Type, Gamma)
where m = typeExpr e >>= \tex-> unify t tex
-//unify e (IdType i) = unify (IdType i) e
- //note, don't use putIdent as that will call unify again
- //unify (IdType i) e=:(IdType j) = modify (\(st, r)->('Map'.put j e st, r))
+
instance unify Type where
unify IntType IntType = pure IntType
unify BoolType BoolType = pure BoolType
unify CharType CharType = pure CharType
instance unify Type where
unify IntType IntType = pure IntType
unify BoolType BoolType = pure BoolType
unify CharType CharType = pure CharType
+ //unify t (IdType i) = unify (IdType i) t
+ //note, don't use putIdent as that will call unify again
+ //unify (IdType i) e=:(IdType j) = modify (\(st, r)->('Map'.put j e st, r))
//unify (ListType t1) (ListType t2) = unify t1 t2
unify t1 t2 = liftT $ Left $ UnifyError zero t1 t2
//unify (ListType t1) (ListType t2) = unify t1 t2
unify t1 t2 = liftT $ Left $ UnifyError zero t1 t2
@@
-159,4
+160,8
@@
extrPos (CharExpr p _) = p
extrPos (BoolExpr p _) = p
extrPos (FunExpr p _) = p
extrPos (EmptyListExpr p) = p
extrPos (BoolExpr p _) = p
extrPos (FunExpr p _) = p
extrPos (EmptyListExpr p) = p
-extrPos (TupleExpr p _) = p
\ No newline at end of file
+extrPos (TupleExpr p _) = p
+
+instance toString Gamma where
+ toString (mp, _) = concat
+ [concat [k, ": ", toString v, "\n"]\\(k, v) <- 'Map'.toList mp]