checked in new version of matita from svn

[helm.git] / helm / ocaml / cic_disambiguation / test_parser.ml

diff --git a/helm/ocaml/cic_disambiguation/test_parser.ml b/helm/ocaml/cic_disambiguation/test_parser.ml
index 356c0a369e7b286aea1d00d92ab790e6aa99a714..31bcdad054e19763f646e09527a5455c63ee80f5 100644 (file)
--- a/helm/ocaml/cic_disambiguation/test_parser.ml
+++ b/helm/ocaml/cic_disambiguation/test_parser.ml
@@ -30,17 +30,16 @@ let pp_tactical = TacticAst2Box.tacticalPp
 let mode =
   try
     match Sys.argv.(1) with
-    | "alias" -> prerr_endline "Alias"; `Alias
     | "term" -> prerr_endline "Term"; `Term
-    | "tactic" -> prerr_endline "Tactic"; `Tactic
-    | "tactical" | "command" -> prerr_endline "Tactical"; `Tactical
-    | "script" -> prerr_endline "Script"; `Script
+    | "statement" -> prerr_endline "Statement"; `Statement
+(*     | "script" -> prerr_endline "Script"; `Script *)
     | _ ->
         prerr_endline "What???????";
         exit 1
   with Invalid_argument _ -> prerr_endline "Term"; `Term
 
 let _ =
+(*
   if mode = `Script then
     let ic = open_in Sys.argv.(2) in
     let istream = Stream.of_channel ic in
@@ -51,6 +50,7 @@ let _ =
         | DisambiguateTypes.Comment (loc, s) -> print_endline s)
       script
   else
+*)
     let ic = stdin in
     try
       while true do
@@ -61,12 +61,17 @@ let _ =
           | `Term ->
               let term = CicTextualParser2.parse_term istream in
               print_endline (BoxPp.pp_term term)
-          | `Tactic ->
-              let tac = CicTextualParser2.parse_tactic istream in
-              print_endline (TacticAstPp.pp_tactic tac)
+          | `Statement ->
+              (match CicTextualParser2.parse_statement istream with
+              | TacticAst.Command (_, cmd) ->
+                  print_endline (TacticAstPp.pp_command cmd)
+              | TacticAst.Tactical (_, tac) ->
+                  print_endline (TacticAstPp.pp_tactical tac))
+(*
           | `Tactical ->
               let tac = CicTextualParser2.parse_tactical istream in
               print_endline (pp_tactical tac)
+*)
           | `Alias ->
               let env = CicTextualParser2.EnvironmentP3.of_string line in
               print_endline (CicTextualParser2.EnvironmentP3.to_string env)