ocaml 3.09 transition

[helm.git] / helm / ocaml / tactics / tacticals.mli

diff --git a/helm/ocaml/tactics/tacticals.mli b/helm/ocaml/tactics/tacticals.mli
index 79a486acb42b0dd5cd4185d73809c60ab3d68eca..88fafc1f8bf5e91be97802e7fcfea51bc44c5d75 100644 (file)
--- a/helm/ocaml/tactics/tacticals.mli
+++ b/helm/ocaml/tactics/tacticals.mli
@@ -23,37 +23,70 @@
  * http://cs.unibo.it/helm/.
  *)
 
-
 val id_tac : ProofEngineTypes.tactic
+val fail_tac: ProofEngineTypes.tactic
+
+(* module type Status =
+ sig
+|+    type external_input_status +|
+   type input_status
+   type output_status
+|+    type external_output_status +|
+
+|+    val internalize: external_input_status -> input_status
+   val externalize: output_status -> external_output_status +|
+
+   type tactic
 
- (* tacticals *)
-val try_tactics:
-  tactics: (string * ProofEngineTypes.tactic) list -> ProofEngineTypes.tactic
+   val mk_tactic : (input_status -> output_status) -> tactic
+   val apply_tactic : tactic -> input_status -> output_status
 
-val thens:
- start: ProofEngineTypes.tactic ->
- continuations: ProofEngineTypes.tactic list -> ProofEngineTypes.tactic
+   val id_tac : tactic
 
-val then_:
- start: ProofEngineTypes.tactic ->
- continuation: ProofEngineTypes.tactic -> ProofEngineTypes.tactic
+   val goals : output_status -> ProofEngineTypes.goal list
+   val get_stack : input_status -> stack
+   val set_stack : stack -> output_status -> output_status
 
+   val inject : input_status -> output_status
+   val focus : goal -> output_status -> input_status
+ end *)
 
-val repeat_tactic: 
- tactic: ProofEngineTypes.tactic -> ProofEngineTypes.tactic
+module type T =
+sig
+  type tactic
 
-val do_tactic:
- n: int ->
- tactic: ProofEngineTypes.tactic -> ProofEngineTypes.tactic 
+  val first: tactics: (string * tactic) list -> tactic
+  val thens: start: tactic -> continuations: tactic list -> tactic
+  val then_: start: tactic -> continuation: tactic -> tactic
+  val seq: tactics: tactic list -> tactic (** "folding" of then_ *)
+  val repeat_tactic: tactic: tactic -> tactic
+  val do_tactic: n: int -> tactic: tactic -> tactic 
+  val try_tactic: tactic: tactic -> tactic 
+  val solve_tactics: tactics: (string * tactic) list -> tactic
 
-val try_tactic:
- tactic: ProofEngineTypes.tactic -> ProofEngineTypes.tactic 
+(*   module C:
+  sig *)
+  val tactic: tactic -> tactic  (** apply tactic to all goal in env *)
+  val skip: tactic
+  val dot: tactic
+  val semicolon: tactic
+  val branch: tactic
+  val shift: tactic
+  val pos: int -> tactic
+  val merge: tactic
+  val focus: int list -> tactic
+  val unfocus: tactic
+(*   end *)
+end
 
-val solve_tactics:
- tactics: (string * ProofEngineTypes.tactic) list -> ProofEngineTypes.tactic
+module Make (S: Continuationals.Status) : T with type tactic = S.tactic
 
+include T with type tactic = ProofEngineTypes.tactic
 
+(* TODO temporary *)
+val goals_diff:
+  before:ProofEngineTypes.goal list ->
+  after:ProofEngineTypes.goal list ->
+  opened:ProofEngineTypes.goal list ->
+    ProofEngineTypes.goal list * ProofEngineTypes.goal list
 
-(*
-val prova_tac : ProofEngineTypes.tactic
-*)