procedural: buggy ast renderer fixed

diff --git a/components/content_pres/acic2Procedural.ml b/components/content_pres/acic2Procedural.ml
index 18ded2e7969579acd0fb94707f00a6ce1afc8278..9b8dbf06383143c7759c9b7f06bb1c95df6ec83a 100644 (file)
--- a/components/content_pres/acic2Procedural.ml
+++ b/components/content_pres/acic2Procedural.ml
@@ -236,7 +236,7 @@ let mk_obj st = function
       let text = Printf.sprintf "tactics: %u" count in
       P.Theorem (s, t, text) :: ast @ [P.Qed ""]
    | _                                                               ->
-      [P.Note "not a theorem"]
+      failwith "not a theorem"
 
 (* interface functions ******************************************************)
 

diff --git a/components/content_pres/proceduralTypes.ml b/components/content_pres/proceduralTypes.ml
index be1dbee73e7ff7ae18d0cf503b24b4a0b64cf20f..0ef73e2488d84b170a45f23f1edfc0e8d5c1ce9d 100644 (file)
--- a/components/content_pres/proceduralTypes.ml
+++ b/components/content_pres/proceduralTypes.ml
@@ -155,23 +155,23 @@ let rec render_step sep a = function
    | Elim (t, xu, s)      -> mk_note s :: cont sep (mk_elim t xu :: a)
    | Apply (t, s)         -> mk_note s :: cont sep (mk_apply t :: a)
    | Branch ([], s)       -> a
-   | Branch ([ps], s)     -> cont sep (render_steps a ps)
+   | Branch ([ps], s)     -> render_steps sep a ps
    | Branch (pss, s)      ->
       let a =  mk_ob :: a in
-      let body = mk_cb :: list_rev_map_concat render_steps mk_vb a pss in
+      let body = mk_cb :: list_rev_map_concat (render_steps None) mk_vb a pss in
       mk_note s :: cont sep body
 
-and render_steps a = function
+and render_steps sep a = function
    | []                                          -> a
-   | [p]                                         -> render_step None a p
-   | (Note _ | Theorem _ | Qed _ as p) :: ps     ->
-      render_steps (render_step None a p) ps 
-   | p :: ((Branch ([], _) :: _) as ps) ->
-      render_steps (render_step None a p) ps
+   | [p]                                         -> render_step sep a p
+   | p :: Branch ([], _) :: ps                   ->
+      render_steps sep a (p :: ps)
    | p :: ((Branch (_ :: _ :: _, _) :: _) as ps) ->
-      render_steps (render_step (Some mk_sc) a p) ps
+      render_steps sep (render_step (Some mk_sc) a p) ps
    | p :: ps                                     ->
-      render_steps (render_step (Some mk_dot) a p) ps
+      render_steps sep (render_step (Some mk_dot) a p) ps
+
+let render_steps a = render_steps None a
 
 (* counting *****************************************************************)