From 5a62ca53356d368ca22dfefe73ab128cb85c304c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9onard=20G=C3=A9rard?= Date: Tue, 30 Nov 2010 11:53:29 +0100 Subject: [PATCH] Fix typing defnames were not rightly handled in [reset] blocks --- compiler/heptagon/analysis/typing.ml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/compiler/heptagon/analysis/typing.ml b/compiler/heptagon/analysis/typing.ml index c031168..d1bff1c 100644 --- a/compiler/heptagon/analysis/typing.ml +++ b/compiler/heptagon/analysis/typing.ml @@ -866,11 +866,9 @@ let rec typing_eq const_env h acc eq = acc | Ereset(b, e) -> let typed_e = expect const_env h (Tid Initial.pbool) e in - let typed_eq_list, acc = typing_eq_list - const_env h acc b.b_equs in - let typed_b = { b with b_equs = typed_eq_list } in + let typed_b, def_names, _ = typing_block const_env h b in Ereset(typed_b, typed_e), - acc + Env.union def_names acc | Eeq(pat, e) -> let acc, ty_pat = typing_pat h acc pat in let typed_e = expect const_env h ty_pat e in