diff options
author | 2013-03-12 20:59:33 +0000 | |
---|---|---|
committer | 2013-03-12 20:59:33 +0000 | |
commit | 198586739090e63ad65051449f1a80f751c4c08b (patch) | |
tree | 9247931c1505bcf8549d5daa4547b227ebe7ae47 /proofs | |
parent | 7c281301637f783beaec858a5fee665e99a6813b (diff) |
Allowing different types of, not to be mixed, generic Stores through
functor application. Rewritten the interface btw.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16267 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'proofs')
-rw-r--r-- | proofs/goal.ml | 3 | ||||
-rw-r--r-- | proofs/goal.mli | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/proofs/goal.ml b/proofs/goal.ml index 6cd00c318..42dcbd192 100644 --- a/proofs/goal.ml +++ b/proofs/goal.ml @@ -56,10 +56,9 @@ let descendent gl e = (* [advance sigma g] returns [Some g'] if [g'] is undefined and is the current avatar of [g] (for instance [g] was changed by [clear] into [g']). It returns [None] if [g] has been (partially) solved. *) -open Store.Field let rec advance sigma g = let evi = Evd.find sigma g.content in - if Option.default false (Evarutil.cleared.get evi.Evd.evar_extra) then + if Option.default false (Evd.Store.get evi.Evd.evar_extra Evarutil.cleared) then let v = match evi.Evd.evar_body with | Evd.Evar_defined c -> c diff --git a/proofs/goal.mli b/proofs/goal.mli index 49667879b..6b587959a 100644 --- a/proofs/goal.mli +++ b/proofs/goal.mli @@ -28,7 +28,6 @@ val pr_goal : goal -> Pp.std_ppcmds (* [advance sigma g] returns [Some g'] if [g'] is undefined and is the current avatar of [g] (for instance [g] was changed by [clear] into [g']). It returns [None] if [g] has been (partially) solved. *) -open Store.Field val advance : Evd.evar_map -> goal -> goal option @@ -189,7 +188,7 @@ module V82 : sig val concl : Evd.evar_map -> goal -> Term.constr (* Access to ".evar_extra" *) - val extra : Evd.evar_map -> goal -> Store.t + val extra : Evd.evar_map -> goal -> Evd.Store.t (* Old style filtered_context primitive *) val filtered_context : Evd.evar_map -> goal -> Sign.named_context @@ -200,7 +199,7 @@ module V82 : sig val mk_goal : Evd.evar_map -> Environ.named_context_val -> Term.constr -> - Store.t -> + Evd.Store.t -> goal * Term.constr * Evd.evar_map (* Equality function on goals *) |