diff options
| author |  Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr> | 2015-04-01 11:14:21 +0200 |
|---|---|---|
| committer | Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr> | 2015-04-01 11:24:08 +0200 |
| commit | f15506263b0f85039b0b3c25c93406b9f9a5f241 (patch) | |
| tree | aa511bf15714ff44c6045637c9204208f6f86ffd | |
| parent | bfa91a895692f4f52e132c3814a472c5e2a24d7b (diff) | |
Removing a probably incorrect on-the-fly require in a tactic.
Also removed the require function it was using, as it is absent from the
remaining of the code.
| -rw-r--r-- | library/library.ml | 4 | ||||
| -rw-r--r-- | library/library.mli | 1 | ||||
| -rw-r--r-- | tactics/equality.ml | 4 |
3 files changed, 1 insertions, 8 deletions
diff --git a/library/library.ml b/library/library.ml index 2b607e1a3..2ebf4e5c3 100644 --- a/library/library.ml +++ b/library/library.ml @@ -592,10 +592,6 @@ let require_library_from_dirpath modrefl export = add_anonymous_leaf (in_require (needed,modrefl,export)); add_frozen_state () -let require_library qidl export = - let modrefl = List.map try_locate_qualified_library qidl in - require_library_from_dirpath modrefl export - let require_library_from_file idopt file export = let modref,needed = rec_intern_library_from_file idopt file in let needed = List.rev_map snd needed in diff --git a/library/library.mli b/library/library.mli index 75b256258..150896783 100644 --- a/library/library.mli +++ b/library/library.mli @@ -21,7 +21,6 @@ open Libnames (** {6 ... } *) (** Require = load in the environment + open (if the optional boolean is not [None]); mark also for export if the boolean is [Some true] *) -val require_library : qualid located list -> bool option -> unit val require_library_from_dirpath : (DirPath.t * string) list -> bool option -> unit val require_library_from_file : Id.t option -> CUnix.physical_path -> bool option -> unit diff --git a/tactics/equality.ml b/tactics/equality.ml index 838f8865d..bcfd6657e 100644 --- a/tactics/equality.ml +++ b/tactics/equality.ml @@ -1230,8 +1230,6 @@ let try_delta_expand env sigma t = let eq_dec_scheme_kind_name = ref (fun _ -> failwith "eq_dec_scheme undefined") let set_eq_dec_scheme_kind k = eq_dec_scheme_kind_name := (fun _ -> k) -let eqdep_dec = qualid_of_string "Coq.Logic.Eqdep_dec" - let inject_if_homogenous_dependent_pair ty = Proofview.Goal.nf_enter begin fun gl -> try @@ -1254,7 +1252,7 @@ let inject_if_homogenous_dependent_pair ty = (* knows inductive types *) if not (Ind_tables.check_scheme (!eq_dec_scheme_kind_name()) (fst ind) && pf_apply is_conv gl ar1.(2) ar2.(2)) then raise Exit; - Library.require_library [Loc.ghost,eqdep_dec] (Some false); + Coqlib.check_required_library ["Coq";"Logic";"Eqdep_dec"]; let new_eq_args = [|pf_type_of gl ar1.(3);ar1.(3);ar2.(3)|] in let inj2 = Coqlib.coq_constant "inj_pair2_eq_dec is missing" ["Logic";"Eqdep_dec"] "inj_pair2_eq_dec" in |