huge commit in automation:

[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 75ce2ee6464c5cbc250240f5673ba0770aebb7f6..ed198d99b6c66ebf7bafbf7a2f036a52668ed6c9 100644 (file)
--- a/helm/software/components/acic_procedural/proceduralTypes.ml
+++ b/helm/software/components/acic_procedural/proceduralTypes.ml
@@ -206,7 +206,7 @@ let mk_cases what pattern punctation =
    mk_tactic tactic punctation
 
 let mk_apply t punctation =
-   let tactic = G.ApplyP (floc, t) in
+   let tactic = G.Apply (floc, t) in
    mk_tactic tactic punctation
 
 let mk_change t where pattern punctation =
@@ -279,12 +279,19 @@ let render_steps a = render_steps mk_dot a
 
 let rec count_step a = function
    | Note _
-   | Statement _  
+   | Statement _
+   | Inductive _
+   | Qed _
+(* level 0 *)   
+   | Intros (Some 0, [], _)
    | Id _
    | Exact _
-   | Qed _           -> a
-   | Branch (pps, _) -> List.fold_left count_steps a pps
-   | _               -> succ a   
+   | Change _
+   | Clear _
+   | ClearBody _            -> a
+   | Branch (pps, _)        -> List.fold_left count_steps a pps
+(* level 1 *)   
+   | _                      -> succ a   
 
 and count_steps a = List.fold_left count_step a
 
@@ -294,7 +301,7 @@ let rec count_node a = function
    | Note _
    | Inductive _
    | Statement _
-   | Qed _
+   | Qed _   
    | Id _
    | Intros _
    | Clear _