X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_disambiguation%2Ftest_parser.ml;h=4ee8ec6ef1340c757cc2639bd44a9dac10ce9c2c;hb=7a72e5c5129c814e567f03e14d752eff4086fb52;hp=a3bba5a5a9b4bf74207a562ab288fdbd976c56bf;hpb=6459acbd4bb69475cfaa0b37a9771ced94193667;p=helm.git

diff --git a/helm/ocaml/cic_disambiguation/test_parser.ml b/helm/ocaml/cic_disambiguation/test_parser.ml
index a3bba5a5a..4ee8ec6ef 100644
--- a/helm/ocaml/cic_disambiguation/test_parser.ml
+++ b/helm/ocaml/cic_disambiguation/test_parser.ml
@@ -23,33 +23,49 @@
  * http://helm.cs.unibo.it/
  *)
 
-let mode = ref `Term
+let pp_tactical = TacticAst2Box.tacticalPp
 
-let _ =
+let mode =
   try
     match Sys.argv.(1) with
-    | "alias" -> mode := `Alias
-    | "term" -> mode := `Term
-    | _ -> ()
-  with Invalid_argument _ -> ()
+    | "alias" -> prerr_endline "Alias"; `Alias
+    | "term" -> prerr_endline "Term"; `Term
+    | "tactic" -> prerr_endline "Tactic"; `Tactic
+    | "tactical" -> prerr_endline "Tactical"; `Tactical
+    | _ ->
+        prerr_endline "What???????";
+        exit 1
+  with Invalid_argument _ -> prerr_endline "Term"; `Term
 
 let _ =
+  let ic = stdin in
   try
-    let ic = stdin in
-    (match !mode with
-    | `Term ->
-        let term = CicTextualParser2.parse_term (Stream.of_channel ic) in
-        close_in ic;
-        print_endline (CicTextualParser2Pp.pp_term term)
-    | `Alias ->
-        while true do
-          let line = input_line ic in
-          let env = CicTextualParser2.EnvironmentP3.of_string line in
-          print_endline (CicTextualParser2.EnvironmentP3.to_string env)
-        done)
-  with
-  | End_of_file -> ()
-  | Stdpp.Exc_located ((p_start, p_end), exn) ->
-    prerr_endline (Printf.sprintf "Exception at character %d-%d: %s"
-      p_start p_end (Printexc.to_string exn))
+    while true do
+      try
+        let line = input_line ic in
+        let istream = Stream.of_string line in
+        (match mode with
+        | `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)
+        | `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));
+        flush stdout
+      with
+      | CicTextualParser2.Parse_error msg -> prerr_endline msg
+(*
+      | Stdpp.Exc_located ((p_start, p_end), exn) ->
+        prerr_endline (Printf.sprintf "Exception at character %d-%d: %s"
+          p_start p_end (Printexc.to_string exn))
+*)
+    done
+  with End_of_file ->
+    close_in ic