some hacks to make the sequent window pretty nice

diff --git a/helm/ocaml/cic_transformations/sequent2pres.ml b/helm/ocaml/cic_transformations/sequent2pres.ml
index 24a3487b807b3db4fadd2a5f0e0adfc28a7a5064..ad2724134f47562b6c0c58633a3941a26b7a8967 100644 (file)
--- a/helm/ocaml/cic_transformations/sequent2pres.ml
+++ b/helm/ocaml/cic_transformations/sequent2pres.ml
@@ -87,8 +87,7 @@ let sequent2pres term2pres (_,_,context,ty) =
  let pres_goal = term2pres ty in 
  (Box.b_h [] [
    Box.b_space; 
-   (Box.b_v
-      []
+   (Box.b_v []
       [Box.b_space;
        pres_context;
        b_ink [None,"width","4cm"; None,"height","2px"]; (* sequent line *)

diff --git a/helm/ocaml/cic_transformations/tacticAst.ml b/helm/ocaml/cic_transformations/tacticAst.ml
index e01b7e7edf2985559668d517fedd7be60781b08b..692d4679e85b012e6da2018d38815c7983b9fae0 100644 (file)
--- a/helm/ocaml/cic_transformations/tacticAst.ml
+++ b/helm/ocaml/cic_transformations/tacticAst.ml
@@ -140,11 +140,20 @@ type ('term, 'ident) tactical =
       (* try a sequence of loc * tacticals until one succeeds, fail otherwise *)
   | Try of loc * ('term, 'ident) tactical (* try a tactical and mask failures *)
 
-type ('term, 'ident) statement =
+
+type ('term, 'ident) code =
   | Command of loc * 'term command
   | Macro of loc * 'term macro 
       (* Macro are substantially queries, but since we are not the kind of
        * peolpe that like to push "start" to turn off the computer 
        * we added this command *)
   | Tactical of loc * ('term, 'ident) tactical
+             
+type ('term, 'ident) comment =
+  | Note of loc * string
+  | Code of loc * ('term, 'ident) code
+             
+type ('term, 'ident) statement =
+  | Executable of loc * ('term, 'ident) code
+  | Comment of loc * ('term, 'ident) comment
 

diff --git a/helm/ocaml/cic_transformations/tacticAstPp.ml b/helm/ocaml/cic_transformations/tacticAstPp.ml
index f781ea3d763b33a6570989eeee5bb825b79fb0c7..9fb8455f9260a7aaa3d1d27049a8e5ab99d712ca 100644 (file)
--- a/helm/ocaml/cic_transformations/tacticAstPp.ml
+++ b/helm/ocaml/cic_transformations/tacticAstPp.ml
@@ -125,6 +125,8 @@ let pp_macro pp_term = function
   | Undo (_, Some n) -> sprintf "Undo %d" n
   | Print (_, name) -> sprintf "Print \"%s\"" name
   | Quit _ -> "Quit"
+  | Instance _
+  | Match _ -> assert false
 
 let pp_macro_ast = pp_macro pp_term_ast
 let pp_macro_cic = pp_macro pp_term_cic
@@ -198,3 +200,15 @@ and pp_tacticals tacs =
 let pp_tactical tac = pp_tactical tac ^ tactical_terminator
 let pp_tactic tac = pp_tactic tac ^ tactic_terminator
 
+let pp_executable = function
+  | Macro (_,x) -> pp_macro_ast x
+  | Tactical (_,x) -> pp_tactical x
+  | Command (_,x) -> pp_command x
+                      
+let pp_comment = function
+  | Note (_,str) -> sprintf "(* %s *)" str
+  | Code (_,code) -> sprintf "(** %s. **)" (pp_executable code)
+
+let pp_statement = function
+  | Executable (_, ex) -> pp_executable ex
+  | Comment (_, c) -> pp_comment c

diff --git a/helm/ocaml/cic_transformations/tacticAstPp.mli b/helm/ocaml/cic_transformations/tacticAstPp.mli
index f9fe2b2b8e4a362a7e7397039593ec4ed72a8c2c..3308adf924c0bc2dbbd82d1423c18e1a4cd3366b 100644 (file)
--- a/helm/ocaml/cic_transformations/tacticAstPp.mli
+++ b/helm/ocaml/cic_transformations/tacticAstPp.mli
@@ -26,6 +26,9 @@
 val pp_tactic: (CicAst.term, string) TacticAst.tactic -> string
 val pp_command: CicAst.term TacticAst.command -> string
 val pp_macro: ('a -> string) -> 'a TacticAst.macro -> string
+val pp_comment: (CicAst.term,string) TacticAst.comment -> string
+val pp_executable: (CicAst.term,string) TacticAst.code -> string
+val pp_statement: (CicAst.term,string) TacticAst.statement -> string
 val pp_macro_ast: CicAst.term TacticAst.macro -> string
 val pp_macro_cic: Cic.term TacticAst.macro -> string
 val pp_tactical: (CicAst.term, string) TacticAst.tactical -> string