home
/
code
/
tiger.ml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sketch-out a dummy escape-finding module
[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
6bb45fd
..
25eb2ce
100644
(file)
--- a/
compiler/src/lib/tiger/tiger_semant.ml
+++ b/
compiler/src/lib/tiger/tiger_semant.ml
@@
-4,6
+4,7
@@
module A = Tiger_absyn
module Dag = Tiger_dag
module Env = Tiger_env
module E = Tiger_error
module Dag = Tiger_dag
module Env = Tiger_env
module E = Tiger_error
+module Escape = Tiger_semant_escape
module Pos = Tiger_position
module Sym = Tiger_symbol
module Translate = Tiger_translate
module Pos = Tiger_position
module Sym = Tiger_symbol
module Translate = Tiger_translate
@@
-192,16
+193,25
@@
end = struct
| A.WhileExp {test; body; pos} ->
(* test : must be int, because we have no bool *)
check_int (trexp test) ~pos;
| A.WhileExp {test; body; pos} ->
(* test : must be int, because we have no bool *)
check_int (trexp test) ~pos;
- ignore (trexp body); (* Only care if a type-error is raised *)
+ let (loop, env) = Env.loop_begin env in
+ (* Only care if an error is raised *)
+ ignore (transExp ~env body);
+ ignore (Env.loop_end env loop);
return_unit
| A.ForExp {var; lo; hi; body; pos; escape=_} ->
check_int (trexp lo) ~pos;
check_int (trexp hi) ~pos;
return_unit
| A.ForExp {var; lo; hi; body; pos; escape=_} ->
check_int (trexp lo) ~pos;
check_int (trexp hi) ~pos;
- (* Only care if a type-error is raised *)
+ let (loop, env) = Env.loop_begin env in
let env = Env.set_val env var (Value.Var {ty = Type.Int}) in
let env = Env.set_val env var (Value.Var {ty = Type.Int}) in
+ (* Only care if an error is raised *)
ignore (transExp ~env body);
ignore (transExp ~env body);
+ ignore (Env.loop_end env loop);
return_unit
return_unit
- | A.BreakExp _ ->
+ | A.BreakExp pos ->
+ (match Env.loop_current env with
+ | Some _ -> ()
+ | None -> E.raise (E.Break_outside_loop pos)
+ );
return_unit
| A.LetExp {decs; body; pos=_} ->
(* (1) decs augment env *)
return_unit
| A.LetExp {decs; body; pos=_} ->
(* (1) decs augment env *)
@@
-326,9
+336,9
@@
end = struct
Env.set_typ env name (Type.Name (name, ref None))
)
in
Env.set_typ env name (Type.Name (name, ref None))
)
in
- List.iter typedecs ~f:(fun (A.TypeDec {name; ty=ty_exp; pos}) ->
- let ty = transTy ~env ty_exp in
- (match env_get_typ ~sym:name ~env ~pos with
+ List.iter typedecs ~f:(fun (A.TypeDec {name
=ty_name
; ty=ty_exp; pos}) ->
+ let ty = transTy ~env
~ty_name ~
ty_exp in
+ (match env_get_typ ~sym:
ty_
name ~env ~pos with
| Type.Name (_, ty_opt_ref) ->
ty_opt_ref := Some ty
| Type.Unit
| Type.Name (_, ty_opt_ref) ->
ty_opt_ref := Some ty
| Type.Unit
@@
-373,7
+383,7
@@
end = struct
);
env_with_fun_heads_only
)
);
env_with_fun_heads_only
)
- and transTy ~(env : Env.t) (ty_exp : A.ty) : Type.t =
+ and transTy ~(env : Env.t)
~ty_name ~
(ty_exp : A.ty) : Type.t =
(match ty_exp with
| A.NameTy {symbol=sym; pos} ->
env_get_typ ~sym ~env ~pos
(match ty_exp with
| A.NameTy {symbol=sym; pos} ->
env_get_typ ~sym ~env ~pos
@@
-384,15
+394,16
@@
end = struct
(name, ty)
)
in
(name, ty)
)
in
- Type.new_record fields
+ Type.new_record
~name:ty_name ~
fields
| A.ArrayTy {symbol=sym; pos} ->
let element_ty = env_get_typ ~sym ~env ~pos in
| A.ArrayTy {symbol=sym; pos} ->
let element_ty = env_get_typ ~sym ~env ~pos in
- Type.new_array element_ty
+ Type.new_array
~name:ty_name ~ty:
element_ty
)
end
open Semant
let transProg absyn =
)
end
open Semant
let transProg absyn =
+ Escape.find absyn;
let {exp = _; ty = _} = transExp absyn ~env:Env.base in
()
let {exp = _; ty = _} = transExp absyn ~env:Env.base in
()
This page took
0.03214 seconds
and
4
git commands to generate.