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
c5e14f3
..
992d660
100644
(file)
--- a/
sem.icl
+++ b/
sem.icl
@@
-35,7
+35,7
@@
get = gets id
getRandomStream :: Int -> [String]
getRandomStream i = genIdents $ filter (isAlpha o toChar) (genRandInt i)
where
getRandomStream :: Int -> [String]
getRandomStream i = genIdents $ filter (isAlpha o toChar) (genRandInt i)
where
- genIdents r = let (ic, r
) = splitAt 5 r in [toString ic: genIdents r
]
+ genIdents r = let (ic, r
2) = splitAt 5 r in [toString ic: genIdents r2
]
freshIdent :: Env String
freshIdent = get >>= \(st, [ident:rest])-> put (st, rest)
freshIdent :: Env String
freshIdent = get >>= \(st, [ident:rest])-> put (st, rest)
@@
-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 runStateT m ('Map'.newMap, getRandomStream
0
) of
+sem (AST vd fd) = case runStateT m ('Map'.newMap, getRandomStream
1
) of
Left e = Left [e]
Right ((vds, fds), gamma) = Right ((AST vds fds), gamma)
where
Left e = Left [e]
Right ((vds, fds), gamma) = Right ((AST vds fds), gamma)
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)
@@
-105,9
+105,9
@@
typeExpr (Op2Expr p e1 BiOr e2) = unify BoolType e1 >>| unify BoolType e2
//a
typeExpr (Op2Expr p e1 BiCons e2) = typeExpr e1 >>= \t1-> typeExpr e2
>>= \t2-> unify (ListType t1) t2
//a
typeExpr (Op2Expr p e1 BiCons e2) = typeExpr e1 >>= \t1-> typeExpr e2
>>= \t2-> unify (ListType t1) t2
-//typeExpr (FunExpr p FunCall) = undef
-typeExpr (EmptyListExpr p) = freshIdent >>= \frsh-> let t = IdType frsh in
+typeExpr (EmptyListExpr p) = freshIdent >>= \frsh-> let t = IdType frsh in
putIdent frsh t >>| pure t
putIdent frsh t >>| pure t
+//typeExpr (FunExpr p FunCall) = undef
//typeExpr (VarExpr Pos VarDef) = undef //when checking var-expr, be sure to
//put the infered type in the context
//typeExpr (VarExpr Pos VarDef) = undef //when checking var-expr, be sure to
//put the infered type in the context
@@
-127,11
+127,16
@@
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
+
+
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 (ListType t1) (ListType t2) = unify t1 t2
+ //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
instance zero Pos where
unify t1 t2 = liftT $ Left $ UnifyError zero t1 t2
instance zero Pos where