New tactic intro. Syntax: "# n".

[helm.git] / helm / software / components / acic_procedural / proceduralTypes.ml

diff --git a/helm/software/components/acic_procedural/proceduralTypes.ml b/helm/software/components/acic_procedural/proceduralTypes.ml
index b194fbfa9fd9f5afce2bfa3f6384ec6d660ab85c..cb4c11d2ee6f87b10d671297b936f903a4da36a4 100644 (file)
--- a/helm/software/components/acic_procedural/proceduralTypes.ml
+++ b/helm/software/components/acic_procedural/proceduralTypes.ml
@@ -79,6 +79,7 @@ type step = Note of note
          | LetIn of name * what * note
          | Rewrite of how * what * where * pattern * note
          | Elim of what * using option * pattern * note
+         | Cases of what * pattern * note
          | Apply of what * note
          | Change of inferred * what * where * pattern * note 
          | Clear of hyp list * note
@@ -194,6 +195,11 @@ let mk_elim what using pattern punctation =
    let tactic = G.Elim (floc, what, using, pattern, (Some 0, [])) in
    mk_tactic tactic punctation
 
+let mk_cases what pattern punctation =
+   let pattern = None, [], Some pattern in
+   let tactic = G.Cases (floc, what, pattern, (Some 0, [])) in
+   mk_tactic tactic punctation
+
 let mk_apply t punctation =
    let tactic = G.ApplyP (floc, t) in
    mk_tactic tactic punctation
@@ -239,6 +245,7 @@ let rec render_step sep a = function
    | LetIn (n, t, s)           -> mk_letin n t sep :: mk_tacnote s a
    | Rewrite (b, t, w, e, s)   -> mk_rewrite b t w e sep :: mk_tacnote s a
    | Elim (t, xu, e, s)        -> mk_elim t xu e sep :: mk_tacnote s a
+   | Cases (t, e, s)           -> mk_cases t e sep :: mk_tacnote s a
    | Apply (t, s)              -> mk_apply t sep :: mk_tacnote s a
    | Change (t, _, w, e, s)    -> mk_change t w e sep :: mk_tacnote s a
    | Clear (ns, s)             -> mk_clear ns sep :: mk_tacnote s a
@@ -267,12 +274,15 @@ let render_steps a = render_steps mk_dot a
 let rec count_step a = function
    | Note _
    | Statement _  
+   | Id _
    | Qed _           -> a
    | Branch (pps, _) -> List.fold_left count_steps a pps
    | _               -> succ a   
 
 and count_steps a = List.fold_left count_step a
 
+let count = I.count_nodes ~meta:false
+
 let rec count_node a = function
    | Note _
    | Inductive _
@@ -284,12 +294,11 @@ let rec count_node a = function
    | ClearBody _             -> a
    | Cut (_, t, _)
    | LetIn (_, t, _)
-   | Apply (t, _)            -> I.count_nodes a (H.cic t)
+   | Apply (t, _)            -> count a (H.cic t)
    | Rewrite (_, t, _, p, _)
    | Elim (t, _, p, _)
-   | Change (t, _, _, p, _)  -> 
-      let a = I.count_nodes a (H.cic t) in
-      I.count_nodes a (H.cic p) 
+   | Cases (t, p, _)
+   | Change (t, _, _, p, _)  -> let a = count a (H.cic t) in count a (H.cic p) 
    | Branch (ss, _)          -> List.fold_left count_nodes a ss
 
 and count_nodes a = List.fold_left count_node a