Skip to content

Commit 61c5881

Browse files
committed
Remove dead-code in theory cloning code.
All code that relates to module replacement is now usused and has been removed.
1 parent 4fc8b63 commit 61c5881

File tree

3 files changed

+5
-51
lines changed

3 files changed

+5
-51
lines changed

src/ecThCloning.ml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ type evclone = {
7171
evc_ops : (xop_override located) Msym.t;
7272
evc_preds : (xpr_override located) Msym.t;
7373
evc_abbrevs : (nt_override located) Msym.t;
74-
evc_modexprs : (me_override located) Msym.t;
7574
evc_modtypes : (mt_override located) Msym.t;
7675
evc_lemmas : evlemma;
7776
evc_ths : (evclone * bool) Msym.t;
@@ -93,7 +92,6 @@ let evc_empty =
9392
evc_ops = Msym.empty;
9493
evc_preds = Msym.empty;
9594
evc_abbrevs = Msym.empty;
96-
evc_modexprs = Msym.empty;
9795
evc_modtypes = Msym.empty;
9896
evc_lemmas = evl;
9997
evc_ths = Msym.empty; }

src/ecThCloning.mli

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ type evclone = {
5757
evc_ops : (xop_override located) Msym.t;
5858
evc_preds : (xpr_override located) Msym.t;
5959
evc_abbrevs : (nt_override located) Msym.t;
60-
evc_modexprs : (me_override located) Msym.t;
6160
evc_modtypes : (mt_override located) Msym.t;
6261
evc_lemmas : evlemma;
6362
evc_ths : (evclone * bool) Msym.t;

src/ecTheoryReplay.ml

Lines changed: 5 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -868,54 +868,11 @@ and replay_modtype
868868
and replay_mod
869869
(ove : _ ovrenv) (subst, ops, proofs, scope) (import, (me : top_module_expr))
870870
=
871-
match Msym.find_opt me.tme_expr.me_name ove.ovre_ovrd.evc_modexprs with
872-
| None ->
873-
let subst, name = rename ove subst (`Module, me.tme_expr.me_name) in
874-
let me = EcSubst.subst_top_module subst me in
875-
let me = { me with tme_expr = { me.tme_expr with me_name = name } } in
876-
let item = (Th_module me) in
877-
(subst, ops, proofs, ove.ovre_hooks.hadd_item scope ~import item)
878-
879-
| Some { pl_desc = (newname, mode) } ->
880-
let name = me.tme_expr.me_name in
881-
let env = EcSection.env (ove.ovre_hooks.henv scope) in
882-
883-
let mp, (newme, newlc) = EcEnv.Mod.lookup (unloc newname) env in
884-
885-
let substme = EcSubst.add_moddef subst ~src:(xpath ove name) ~dst:mp in
886-
887-
let me = EcSubst.subst_top_module substme me in
888-
let me = { me with tme_expr = { me.tme_expr with me_name = name } } in
889-
let newme = { newme with me_name = name } in
890-
let newme = { tme_expr = newme; tme_loca = Option.get newlc; } in
891-
892-
if not (EcReduction.EqTest.for_mexpr ~body:false env me.tme_expr newme.tme_expr) then
893-
clone_error env (CE_ModIncompatible (snd ove.ovre_prefix, name));
894-
895-
let subst =
896-
match mode with
897-
| `Alias ->
898-
fst (rename ove subst (`Module, name))
899-
| `Inline _ ->
900-
substme in
901-
902-
let newme =
903-
if mode = `Alias || mode = `Inline `Keep then
904-
let alias = ME_Alias (
905-
List.length newme.tme_expr.me_params,
906-
EcPath.m_apply
907-
mp
908-
(List.map (fun (id, _) -> EcPath.mident id) newme.tme_expr.me_params)
909-
)
910-
in { newme with tme_expr = { newme.tme_expr with me_body = alias } }
911-
else newme in
912-
913-
let scope =
914-
if keep_of_mode mode
915-
then ove.ovre_hooks.hadd_item scope ~import (Th_module newme)
916-
else scope in
917-
918-
(subst, ops, proofs, scope)
871+
let subst, name = rename ove subst (`Module, me.tme_expr.me_name) in
872+
let me = EcSubst.subst_top_module subst me in
873+
let me = { me with tme_expr = { me.tme_expr with me_name = name } } in
874+
let item = (Th_module me) in
875+
(subst, ops, proofs, ove.ovre_hooks.hadd_item scope ~import item)
919876

920877
(* -------------------------------------------------------------------- *)
921878
and replay_export

0 commit comments

Comments
 (0)