X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_disambiguation%2Ftest_parser.ml;h=4f918b0a0d2f7641f55a4d0b43f2a5f73f7433c0;hb=12cc5b2b8e7f7bb0b5e315094b008a293a4df6b1;hp=ff4ae9726e41bac09d7dad80d831d92d54e1d6bd;hpb=5095f0f9e11e966d7872d38ab8ef408567c5984e;p=helm.git

diff --git a/helm/ocaml/cic_disambiguation/test_parser.ml b/helm/ocaml/cic_disambiguation/test_parser.ml
index ff4ae9726..4f918b0a0 100644
--- a/helm/ocaml/cic_disambiguation/test_parser.ml
+++ b/helm/ocaml/cic_disambiguation/test_parser.ml
@@ -23,48 +23,73 @@
  * http://helm.cs.unibo.it/
  *)
 
-let default_mode = `Term
+open Printf
 
-let mode = ref default_mode
+(*
+let pp_tactical = TacticAst2Box.tacticalPp
+*)
 
-let _ =
+let modes = ("term",`Term) :: ("statement",`Statement) :: []
+
+let mode =
   try
-    match Sys.argv.(1) with
-    | "alias" -> mode := `Alias
-    | "term" -> mode := `Term
-    | "tactic" -> mode := `Tactic
-    | "tactical" -> mode := `Tactical
-    | _ ->
-        prerr_endline "What???????";
-        exit 1
-  with Invalid_argument _ -> ()
+    List.assoc (Sys.argv.(1)) modes
+  with 
+  | _ ->
+      prerr_endline 
+        (sprintf "What? Supported modes are: %s\n" 
+          (String.concat " " (List.map fst modes)));
+      exit 1
 
 let _ =
-  let ic = stdin in
-  try
-    while true do
-      try
+(*
+  if mode = `Script then
+    let ic = open_in Sys.argv.(2) in
+    let istream = Stream.of_channel ic in
+    let (loc, script) = CicTextualParser2.parse_script istream in
+    List.iter
+      (function
+        | DisambiguateTypes.Command cmd -> print_endline (pp_tactical cmd)
+        | DisambiguateTypes.Comment (loc, s) -> print_endline s)
+      script
+  else
+*)
+    let ic = stdin in
+    try
+      while true do
         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 term = CicTextualParser2.parse_tactic istream in
-            print_endline (TacticAstPp.pp_tactic term)
-        | `Tactical ->
-            let term = CicTextualParser2.parse_tactical istream in
-            print_endline (TacticAstPp.pp_tactical term)
-        | `Alias ->
-            let env = CicTextualParser2.EnvironmentP3.of_string line in
-            print_endline (CicTextualParser2.EnvironmentP3.to_string env));
-        flush stdout
-      with
-      | 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
+        try
+          (match mode with
+          | `Term ->
+              let term = CicTextualParser2.parse_term istream in
+              print_endline (BoxPp.pp_term term)
+          | `Statement ->
+              (match CicTextualParser2.parse_statement istream with
+              | TacticAst.Executable (_, exe) 
+              | TacticAst.Comment (_,TacticAst.Code (_, exe)) ->
+                  print_endline (TacticAstPp.pp_executable exe)
+              | TacticAst.Comment (_,TacticAst.Note (_, note)) ->
+                  print_endline note)
+(*
+          | `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)
+          | _ -> assert false);
+          flush stdout
+        with
+        | CicTextualParser2.Parse_error (floc, msg) ->
+            let (x, y) = CicAst.loc_of_floc floc in
+            let before = String.sub line 0 x in
+            let error = String.sub line x (y - x) in
+            let after = String.sub line y (String.length line - y) in
+            eprintf "%s%s%s\n" before error after;
+            prerr_endline (sprintf "at character %d-%d: %s" x y msg)
+      done
+    with End_of_file ->
+      close_in ic