Commit 940f797e authored by Andrei Paskevich's avatar Andrei Paskevich

slightly improve upon the previous commit

parent 9e686eca
......@@ -42,7 +42,8 @@ let ns_replace eq chk x vo vn =
let rec merge_ns chk ns1 ns2 =
if ns1 == ns2 then ns1 else
let join eq x n o = Some (ns_replace eq chk x o n) in
let ns_union eq m1 m2 = Mstr.union (join eq) m1 m2 in
let ns_union eq m1 m2 =
if m1 == m2 then m1 else Mstr.union (join eq) m1 m2 in
let fusion _ ns1 ns2 = Some (merge_ns chk ns1 ns2) in
{ ns_ts = ns_union ts_equal ns1.ns_ts ns2.ns_ts;
ns_ls = ns_union ls_equal ns1.ns_ls ns2.ns_ls;
......
......@@ -78,7 +78,8 @@ let psym_sub p1 p2 = match p1,p2 with
let rec merge_ns chk ns1 ns2 =
if ns1 == ns2 then ns1 else
let join sub x n o = Some (ns_replace sub chk x o n) in
let ns_union sub m1 m2 = Mstr.union (join sub) m1 m2 in
let ns_union sub m1 m2 =
if m1 == m2 then m1 else Mstr.union (join sub) m1 m2 in
let fusion _ ns1 ns2 = Some (merge_ns chk ns1 ns2) in
{ ns_ts = ns_union tsym_sub ns1.ns_ts ns2.ns_ts;
ns_ps = ns_union psym_sub ns1.ns_ps ns2.ns_ps;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment