home
/
code
/
tiger.ml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add micro test for recursive type def
[tiger.ml.git]
/
compiler
/
src
/
lib
/
tiger
/
tiger_semant.ml
diff --git
a/compiler/src/lib/tiger/tiger_semant.ml
b/compiler/src/lib/tiger/tiger_semant.ml
index
f653e16
..
70639e9
100644
(file)
--- a/
compiler/src/lib/tiger/tiger_semant.ml
+++ b/
compiler/src/lib/tiger/tiger_semant.ml
@@
-100,12
+100,18
@@
end = struct
E.raise (E.Wrong_type_used_as_record {ty_id=typ; ty; pos})
);
return ty
E.raise (E.Wrong_type_used_as_record {ty_id=typ; ty; pos})
);
return ty
- | A.SeqExp exps ->
- (* Ignoring value because we only care if a type-checking exception
- * is raised in one of trexp calls: *)
- List.iter exps ~f:(fun (exp, _) -> ignore (trexp exp));
- (* FIXME: Return type of last expression, not unit. *)
+ | A.SeqExp [] ->
return_unit
return_unit
+ | A.SeqExp exps ->
+ let last xs =
+ xs
+ |> List.rev (* Yes, redundant, but clean-looking ;-P *)
+ |> List.hd (* Empty is matched in above SeqExp match case *)
+ in
+ exps
+ |> List.map ~f:(fun (exp, _) -> let {ty; _} = trexp exp in ty)
+ |> last
+ |> return
| A.AssignExp {var; exp; pos} ->
check_same (trvar var) (trexp exp) ~pos;
(* TODO: Add var->exp to val env? *)
| A.AssignExp {var; exp; pos} ->
check_same (trvar var) (trexp exp) ~pos;
(* TODO: Add var->exp to val env? *)
@@
-132,7
+138,8
@@
end = struct
check_int (trexp lo) ~pos;
check_int (trexp hi) ~pos;
(* Only care if a type-error is raised *)
check_int (trexp lo) ~pos;
check_int (trexp hi) ~pos;
(* Only care if a type-error is raised *)
- ignore (transExp ~env:(Env.set_typ env var Type.Int) body);
+ let env = Env.set_val env var (Value.Var {ty = Type.Int}) in
+ ignore (transExp ~env body);
return_unit
| A.BreakExp _ ->
return_unit
return_unit
| A.BreakExp _ ->
return_unit
This page took
0.025727 seconds
and
4
git commands to generate.