jeltz/heptagon
1
0
Fork 0
Code Issues Pull requests Releases Activity

Typing fix: type static exp initializing a last.

Browse source
This commit is contained in:
Adrien Guatto 2010-08-17 15:04:54 +02:00
parent 744565250e
commit fe1475a03e
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
compiler/heptagon/analysis/typing.ml
View file

@ -994,12 +994,17 @@ and build const_env h dec =
let var_dec (acc_defined, h) vd =
try
let ty = check_type const_env vd.v_type in
if Env.mem vd.v_ident h then
error (Ealready_defined(sourcename vd.v_ident));
let acc_defined = Env.add vd.v_ident ty acc_defined in
let h = Env.add vd.v_ident { ty = ty; last = last vd.v_last } h in
{ vd with v_type = ty }, (acc_defined, h)
let last_dec = match vd.v_last with
| Last (Some se) -> Last (Some (expect_static_exp const_env ty se))
| Var | Last None -> vd.v_last in
if Env.mem vd.v_ident h then
error (Ealready_defined(sourcename vd.v_ident));
let acc_defined = Env.add vd.v_ident ty acc_defined in
let h = Env.add vd.v_ident { ty = ty; last = last vd.v_last } h in
{ vd with v_last = last_dec; v_type = ty }, (acc_defined, h)
with
TypingError(kind) -> message vd.v_loc kind
in