X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_disambiguation%2Ftest_parser.ml;h=dde96955506853815b0f4bebe7f0a29a8f428233;hb=91abd1cde37b3a21abce01b4898dd4161c0adcb2;hp=581b8d3e401c13f9952577d39f1872eb051952f7;hpb=a73d3f9cd6bda37cfb538e9fdf66f905a01d8e37;p=helm.git

diff --git a/helm/ocaml/cic_disambiguation/test_parser.ml b/helm/ocaml/cic_disambiguation/test_parser.ml
index 581b8d3e4..dde969555 100644
--- a/helm/ocaml/cic_disambiguation/test_parser.ml
+++ b/helm/ocaml/cic_disambiguation/test_parser.ml
@@ -23,33 +23,67 @@
  * http://helm.cs.unibo.it/
  *)
 
-let mode = ref `Term
+let default_mode = `Term
+
+let mode = ref default_mode
+
+(* let pp_tactical = TacticAstPp.pp_tactical *)
+
+let pp_tactical = TacticAst2Box.tacticalPp
+let pp_command = CommandAst.pp_command
+let pp_script = CommandAst.pp_script
 
 let _ =
   try
     match Sys.argv.(1) with
     | "alias" -> mode := `Alias
     | "term" -> mode := `Term
-    | _ -> ()
+    | "tactic" -> mode := `Tactic
+    | "tactical" -> mode := `Tactical
+    | "command" -> mode := `Command
+    | "script" -> mode := `Script
+    | _ ->
+        prerr_endline "What???????";
+        exit 1
   with Invalid_argument _ -> ()
 
 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 (CicAstPp.pp_term term)
-    | `Alias ->
-        while true do
+    if !mode =  `Script then begin
+      let script = CicTextualParser2.parse_script (Stream.of_channel ic) in
+      print_endline (pp_script script)
+    end else
+      while true do
+        try
           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))
+          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)
+          | `Command ->
+              let cmd = CicTextualParser2.parse_command istream in
+              print_endline (pp_command cmd)
+          | `Script -> assert false (* catched above *)
+          | `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