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

Fix static_scoping with locally defined types.

Browse source
This commit is contained in:
Léonard Gérard 2011-05-24 18:30:45 +02:00
parent 96054a67b6
commit d7553b9db0
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
compiler/heptagon/parsing/hept_scoping.ml
View file

@ -461,6 +461,7 @@ let translate_const_dec cd =
let c_name = current_qual cd.c_name in
let c_type = translate_type cd.c_loc cd.c_type in
let c_value = expect_static_exp cd.c_value in
replace_const c_name (Signature.mk_const_def c_type c_value);
{ Heptagon.c_name = c_name;
Heptagon.c_type = c_type;
Heptagon.c_value = c_value;

6
compiler/heptagon/parsing/hept_static_scoping.ml
View file

@ -64,9 +64,9 @@ let node funs _ n =
let const_dec funs local_const cd =
let cd, _ = Hept_parsetree_mapfold.const_dec funs local_const cd in
let c_name = current_qual cd.c_name in
let c_type = Hept_scoping.translate_type cd.c_loc cd.c_type in
let c_value = Hept_scoping.expect_static_exp cd.c_value in
add_const c_name (Signature.mk_const_def c_type c_value);
(* /!\ we need to add the consts to detect all the static_exps,*)
(* /!\ but we can't qualify their types, scoping will correct this *)
add_const c_name (Signature.mk_const_def Types.Tinvalid (Initial.mk_static_string "invalid"));
cd, local_const
let program p =