From: natile Date: Tue, 1 Oct 2002 17:40:00 +0000 (+0000) Subject: Without warning X-Git-Tag: new_mathql_before_first_merge~22 X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=commitdiff_plain;h=93f90c8035a846fad1a51a70e59da3e4828a4e97;p=helm.git Without warning --- diff --git a/helm/ocaml/mathql_interpreter/mqint.ml b/helm/ocaml/mathql_interpreter/mqint.ml index c28aa02a0..89c180abe 100644 --- a/helm/ocaml/mathql_interpreter/mqint.ml +++ b/helm/ocaml/mathql_interpreter/mqint.ml @@ -281,8 +281,8 @@ let rec exec_set_exp c = function let rec select_ex rset = match rset with [] -> [] - | r::tl -> upd_rvars c ((rvar,r)::c.rvars); - if (exec_boole_exp c bexp) then r::(select_ex tl) + | r::tl -> let c1 = upd_rvars c ((rvar,r)::c.rvars) in + if (exec_boole_exp c1 bexp) then r::(select_ex tl) else select_ex tl in select_ex rset @@ -315,8 +315,8 @@ and exec_boole_exp c = function | (uri,attl)::tail1 -> let rec sub_prod attl = match attl with (*per ogni el. di attl *) [] -> () -(*devo andare in ric. su tail1*) | att::tail2 -> upd_groups c ((uri,att)::c.groups); - prod c tail1; sub_prod tail2 +(*devo andare in ric. su tail1*) | att::tail2 -> let c1 = upd_groups c ((uri,att)::c.groups) in + prod c1 tail1; sub_prod tail2 in sub_prod attl in @@ -330,7 +330,7 @@ and exec_val_exp c = function | MathQL.Const x -> let ol = List.sort compare x in let rec edup = function [] -> [] - | s::tl -> if s = (List.tl tl) then edup tl + | s::tl -> if s = (List.hd tl) then edup tl else s::(edup tl) in edup ol