- moved command as sub-entries of tactical grammars (as per tactics)

[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 dde96955506853815b0f4bebe7f0a29a8f428233..4ee8ec6ef1340c757cc2639bd44a9dac10ce9c2c 100644 (file)
--- a/helm/ocaml/cic_disambiguation/test_parser.ml
+++ b/helm/ocaml/cic_disambiguation/test_parser.ml
@@ -23,67 +23,49 @@
  * http://helm.cs.unibo.it/
  *)
 
-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 _ =
+let mode =
   try
     match Sys.argv.(1) with
-    | "alias" -> mode := `Alias
-    | "term" -> mode := `Term
-    | "tactic" -> mode := `Tactic
-    | "tactical" -> mode := `Tactical
-    | "command" -> mode := `Command
-    | "script" -> mode := `Script
+    | "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 _ -> ()
+  with Invalid_argument _ -> prerr_endline "Term"; `Term
 
 let _ =
   let ic = stdin in
   try
-    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 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
+    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