X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fsoftware%2Fcomponents%2Ftactics%2Fparamodulation%2Fequality.mli;fp=helm%2Fsoftware%2Fcomponents%2Ftactics%2Fparamodulation%2Fequality.mli;h=d2c58041d680089c804b6ef90a29c03ecbb9bbf9;hb=5b911ecf8bcb1644b82316d5f2709ae253a6a36d;hp=1a2a3a2808d3d284a4f00f4eda4ebe289f5b2ca5;hpb=9b8ad1220893070c9a98500f99355bba7775743d;p=helm.git

diff --git a/helm/software/components/tactics/paramodulation/equality.mli b/helm/software/components/tactics/paramodulation/equality.mli
index 1a2a3a280..d2c58041d 100644
--- a/helm/software/components/tactics/paramodulation/equality.mli
+++ b/helm/software/components/tactics/paramodulation/equality.mli
@@ -23,45 +23,17 @@
  * http://helm.cs.unibo.it/
  *)
 
-type substitution 
-
-type rule = SuperpositionRight | SuperpositionLeft |Demodulation
+type rule = SuperpositionRight | SuperpositionLeft | Demodulation
 
 type equality 
 
-and proof = new_proof * old_proof
-
-and new_proof =
+and proof =
     Exact of Cic.term
-  | Step of substitution * (rule * int * (Utils.pos * int) * Cic.term)
-
-and old_proof =
-    NoProof
-  | BasicProof of substitution * Cic.term
-  | ProofBlock of substitution * UriManager.uri * (Cic.name * Cic.term) *
-      Cic.term * (Utils.pos * equality) * old_proof
-  | ProofGoalBlock of old_proof * old_proof
-  | ProofSymBlock of Cic.term list * old_proof
-  | SubProof of Cic.term * int * old_proof
+  | Step of Subst.substitution * (rule * int * (Utils.pos * int) * Cic.term)
 
-and goal_proof = (Utils.pos * int * substitution * Cic.term) list
+and goal_proof = (Utils.pos * int * Subst.substitution * Cic.term) list
 
-val pp_proof: (Cic.name option) list -> goal_proof -> new_proof -> string
-
-val empty_subst : substitution
-val apply_subst : substitution -> Cic.term -> Cic.term
-val apply_subst_metasenv : substitution -> Cic.metasenv -> Cic.metasenv
-val ppsubst : substitution -> string
-val buildsubst : 
-  int -> Cic.context -> Cic.term -> Cic.term -> substitution -> 
-    substitution
-val flatten_subst : substitution -> substitution 
-val lookup_subst : Cic.term -> substitution -> Cic.term
-val filter : substitution -> Cic.metasenv -> Cic.metasenv
-val is_in_subst : int -> substitution -> bool
-val merge_subst_if_possible: 
-  substitution -> substitution -> 
-    substitution option
+val pp_proof: (Cic.name option) list -> goal_proof -> proof -> string
 
 val reset : unit -> unit
 
@@ -80,14 +52,15 @@ val open_equality :
     int * proof * 
     (Cic.term * Cic.term * Cic.term * Utils.comparison) *
     Cic.metasenv * int
+val depend : equality -> int -> bool
 val compare : equality -> equality -> int
 val string_of_equality : ?env:Utils.environment -> equality -> string
-val string_of_proof_old : ?names:(Cic.name option)list -> old_proof -> string
-val string_of_proof_new : 
-  ?names:(Cic.name option)list -> new_proof -> goal_proof -> string
-val build_proof_term_new: new_proof -> Cic.term 
-val build_proof_term_old: ?noproof:Cic.term -> old_proof -> Cic.term
-val build_goal_proof: goal_proof -> Cic.term -> Cic.term
+val string_of_proof : 
+  ?names:(Cic.name option)list -> proof -> goal_proof -> string
+val build_proof_term: proof -> Cic.term 
+(* build_goal_proof [goal_proof] [initial_proof] [ty] 
+ *  [ty] is the type of the goal *)
+val build_goal_proof: goal_proof -> Cic.term -> Cic.term-> Cic.term
 val refl_proof: Cic.term -> Cic.term -> Cic.term 
 (** ensures that metavariables in equality are unique *)
 val fix_metas: int -> equality -> int * equality
@@ -116,4 +89,3 @@ val meta_convertibility_eq: equality -> equality -> bool
 
 val is_weak_identity: equality -> bool
 val is_identity: Utils.environment -> equality -> bool
-