repositories
/
cc1516.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Working on statements
[cc1516.git]
/
sem.icl
diff --git
a/sem.icl
b/sem.icl
index
0146c3a
..
ffe95dd
100644
(file)
--- a/
sem.icl
+++ b/
sem.icl
@@
-90,8
+90,8
@@
sem (AST vd fd) = case runStateT m ('Map'.newMap, getRandomStream 1) of
Right ((vds, fds), gamma) = Right ((AST vds fds), gamma)
where
m :: Env ([VarDecl], [FunDecl])
Right ((vds, fds), gamma) = Right ((AST vds fds), gamma)
where
m :: Env ([VarDecl], [FunDecl])
- m = mapM sem
FunDecl fd >>= \fds ->
- mapM sem
VarDecl vd >>= \v
ds ->
+ m = mapM sem
VarDecl vd >>= \vds ->
+ mapM sem
FunDecl fd >>= \f
ds ->
pure (vds, fds)
semFunDecl :: FunDecl -> Env FunDecl
pure (vds, fds)
semFunDecl :: FunDecl -> Env FunDecl
@@
-108,19
+108,16
@@
semVarDecl (VarDecl pos type ident ex) = unify type ex
checkStmt ::Type Stmt -> Env Stmt
checkStmt t (IfStmt c st se) = unify BoolType c >>| mapM (checkStmt t) st
>>= \st1-> mapM (checkStmt t) se >>= \se1-> pure (IfStmt c st1 se1)
checkStmt ::Type Stmt -> Env Stmt
checkStmt t (IfStmt c st se) = unify BoolType c >>| mapM (checkStmt t) st
>>= \st1-> mapM (checkStmt t) se >>= \se1-> pure (IfStmt c st1 se1)
-checkStmt t (WhileStmt c [et]) = undef
+checkStmt t w=:(WhileStmt c et) = unify BoolType c >>| mapM (checkStmt t) et
+ >>= \et1-> pure w
checkStmt t (AssStmt (VarDef ident fs) e) = undef
checkStmt t (AssStmt (VarDef ident fs) e) = undef
-checkStmt t
(FunStmt (FunCall f es)) = undef
+checkStmt t
r=:(FunStmt funcall) = typeFun funcall >>| pure r
checkStmt VoidType r=:(ReturnStmt Nothing) = pure r
checkStmt VoidType r=:(ReturnStmt Nothing) = pure r
-checkStmt t r=:(ReturnStmt (Just e)) = typeExpr e >>= \te -> unify t te
- >>| pure r
+checkStmt t r=:(ReturnStmt (Just e)) = unify t e >>| pure r
all :: [Bool] -> Bool
all as = foldr (&&) True as
all :: [Bool] -> Bool
all as = foldr (&&) True as
-last :: [a] -> a
-last as = foldl (\_ r -> r) (hd as) as
-
typeExpr :: Expr -> Env Type
typeExpr (IntExpr _ _) = pure IntType
typeExpr (CharExpr _ _) = pure CharType
typeExpr :: Expr -> Env Type
typeExpr (IntExpr _ _) = pure IntType
typeExpr (CharExpr _ _) = pure CharType
@@
-142,11
+139,7
@@
typeExpr (Op2Expr p e1 op e2)
>>= \t2-> unify (ListType t1) t2
typeExpr (EmptyListExpr p) = freshIdent >>= \frsh-> let t = IdType frsh in
putIdent frsh t >>| pure t
>>= \t2-> unify (ListType t1) t2
typeExpr (EmptyListExpr p) = freshIdent >>= \frsh-> let t = IdType frsh in
putIdent frsh t >>| pure t
-typeExpr (FunExpr p (FunCall f es)) = gets (\(st, r)->'Map'.get f st)
- >>= \mt-> case mt of
- Nothing = freshIdent >>= \frsh-> buildFunctionType frsh es
- >>= \ft-> putIdent f ft >>| (pure $ IdType frsh)
- Just t = unifyApp t es
+typeExpr (FunExpr p funcall) = typeFun funcall
typeExpr (VarExpr p (VarDef ident fs)) = gets (\(st, r)->'Map'.get ident st)
>>= \mt->case mt of
Nothing = liftT $ Left $ UndeclaredVariableError p ident
typeExpr (VarExpr p (VarDef ident fs)) = gets (\(st, r)->'Map'.get ident st)
>>= \mt->case mt of
Nothing = liftT $ Left $ UndeclaredVariableError p ident
@@
-184,7
+177,6
@@
instance unify Expr where
unify (IdType _) e = liftT $ Left $ ParseError (extrPos e)
"Expression cannot be an polymorf type."
unify VarType e = typeExpr e
unify (IdType _) e = liftT $ Left $ ParseError (extrPos e)
"Expression cannot be an polymorf type."
unify VarType e = typeExpr e
- unify (IdType i) e = undef
//we have to cheat to decorate the error, can be done nicer?
unify t e = StateT $ \s0 -> let res = runStateT m s0 in case res of
Left err = Left $ decErr e err
//we have to cheat to decorate the error, can be done nicer?
unify t e = StateT $ \s0 -> let res = runStateT m s0 in case res of
Left err = Left $ decErr e err
@@
-206,6
+198,12
@@
instance unify Type where
instance zero Pos where
zero = {line=0,col=0}
instance zero Pos where
zero = {line=0,col=0}
+typeFun :: FunCall -> Env Type
+typeFun (FunCall f es) = gets (\(st, r)->'Map'.get f st) >>= \mt-> case mt of
+ Nothing = freshIdent >>= \frsh-> buildFunctionType frsh es
+ >>= \ft-> putIdent f ft >>| (pure $ IdType frsh)
+ Just t = unifyApp t es
+
decErr :: Expr SemError -> SemError
decErr e (UnifyError _ t1 t2) = UnifyError (extrPos e) t1 t2
decErr e (FieldSelectorError _ t fs) = FieldSelectorError (extrPos e) t fs
decErr :: Expr SemError -> SemError
decErr e (UnifyError _ t1 t2) = UnifyError (extrPos e) t1 t2
decErr e (FieldSelectorError _ t fs) = FieldSelectorError (extrPos e) t fs