X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_disambiguation%2Ftest_parser.ml;h=3b30e59001dd35aba70508c6ecdf4ce2b5adebe3;hb=acf29bdbdcdc6ad8c2d9d27e8a47500981b605cd;hp=b7cace0cb1dece3d5f54ae179acd9d251a39a7a5;hpb=18ad62cacbbb08decd4332b0bab449e640114fd7;p=helm.git

diff --git a/helm/ocaml/cic_disambiguation/test_parser.ml b/helm/ocaml/cic_disambiguation/test_parser.ml
index b7cace0cb..3b30e5900 100644
--- a/helm/ocaml/cic_disambiguation/test_parser.ml
+++ b/helm/ocaml/cic_disambiguation/test_parser.ml
@@ -27,20 +27,20 @@ open Printf
 
 let pp_tactical = TacticAst2Box.tacticalPp
 
+let modes = ("term",`Term) :: ("statement",`Statement) :: []
+
 let mode =
   try
-    match Sys.argv.(1) with
-    | "alias" -> prerr_endline "Alias"; `Alias
-    | "term" -> prerr_endline "Term"; `Term
-    | "tactic" -> prerr_endline "Tactic"; `Tactic
-    | "tactical" -> prerr_endline "Tactical"; `Tactical
-    | "script" -> prerr_endline "Script"; `Script
-    | _ ->
-        prerr_endline "What???????";
-        exit 1
-  with Invalid_argument _ -> prerr_endline "Term"; `Term
+    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 _ =
+(*
   if mode = `Script then
     let ic = open_in Sys.argv.(2) in
     let istream = Stream.of_channel ic in
@@ -51,6 +51,7 @@ let _ =
         | DisambiguateTypes.Comment (loc, s) -> print_endline s)
       script
   else
+*)
     let ic = stdin in
     try
       while true do
@@ -61,12 +62,18 @@ 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.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)