X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_notation%2Ftest_parser.ml;h=77135a977d04778312c676faf984ff0beddfa04a;hb=bf6144a808a16d4e576e56593bbcd63b8db5fe4c;hp=05a80d982fdfd95cb893535f5c9739a51f22d73b;hpb=7f72a2bf9a6f79c58048c594dc390265365face8;p=helm.git

diff --git a/helm/ocaml/cic_notation/test_parser.ml b/helm/ocaml/cic_notation/test_parser.ml
index 05a80d982..77135a977 100644
--- a/helm/ocaml/cic_notation/test_parser.ml
+++ b/helm/ocaml/cic_notation/test_parser.ml
@@ -26,25 +26,8 @@
 open Printf
 
 let _ =
-  Helm_registry.set "getter.mode" "remote";
-  Helm_registry.set "getter.url" "http://helm.cs.unibo.it:58081/"
-
-  (* ORRIBLE HACK! conversion:
-   * (Cic.id, string) Hashtbl.t -> (Cic.id, CicNotationtPt.sort_kind) Hashtbl.t
-   *)
-let patch_sort_tbl tbl =
-  let sort_of_string = function
-    | "Prop" -> `Prop
-    | "Set" -> `Set
-    | "Type" | "?" -> `Type
-    | "CProp" -> `CProp
-    | _ -> assert false
-  in
-  let tbl' = Hashtbl.create (Hashtbl.length tbl) in
-  Hashtbl.iter
-    (fun id sort_str -> Hashtbl.add tbl' id (sort_of_string sort_str))
-    tbl;
-  tbl'
+  Helm_registry.load_from "test_parser.conf.xml";
+  Http_getter.init ()
 
 let _ =
   let module P = CicNotationPt in
@@ -97,15 +80,26 @@ let _ =
         | -1 ->
             (match CicNotationParser.parse_phrase istream with
             | P.Print t -> 
-                print_endline (CicNotationPp.pp_term t); flush stdout
+                prerr_endline "====";
+                print_endline (CicNotationPp.pp_term t); flush stdout;
+                let t' = CicNotationRew.pp_ast t in
+                print_endline (CicNotationPp.pp_term t'); flush stdout
             | P.Notation (l1, associativity, precedence, l2) ->
-                print_endline "Extending notation ..."; flush stdout;
+                print_endline "Extending parser ..."; flush stdout;
+                let time1 = Unix.gettimeofday () in
                 ignore
                   (CicNotationParser.extend l1 ?precedence ?associativity
-                    (fun env loc ->
-                      prerr_endline "ENV";
-                      prerr_endline (CicNotationPp.pp_env env);
-                      CicNotationFwd.instantiate_level2 env l2))
+                    (fun env loc -> CicNotationFwd.instantiate_level2 env l2));
+                let time2 = Unix.gettimeofday () in
+                print_endline "Extending pretty printer ..."; flush stdout;
+                let time3 = Unix.gettimeofday () in
+                ignore
+                  (CicNotationRew.add_pretty_printer ?precedence ?associativity
+                    l2 l1);
+                let time4 = Unix.gettimeofday () in
+                printf "done (extending parser took %f, extending pretty printer took %f)\n"
+                  (time2 -. time1) (time4 -. time3);
+                flush stdout
             | P.Interpretation (l2, l3) ->
                 print_endline "Adding interpretation ..."; flush stdout;
                 let time1 = Unix.gettimeofday () in
@@ -125,14 +119,21 @@ let _ =
                   | Cic.AVariable (_, _, _, ty, _, _) -> ty
                   | _ -> assert false
                 in
-                let id_to_sort = patch_sort_tbl id_to_sort in
                 let time1 = Unix.gettimeofday () in
                 let t, id_to_uri =
                   CicNotationRew.ast_of_acic id_to_sort annterm
                 in
                 let time2 = Unix.gettimeofday () in
                 printf "ast creation took %f seconds\n" (time2 -. time1);
-                print_endline (CicNotationPp.pp_term t); flush stdout)
+                prerr_endline "====";
+                print_endline (CicNotationPp.pp_term t); flush stdout;
+                flush stdout;
+                let time3 = Unix.gettimeofday () in
+                let t' = CicNotationRew.pp_ast t in
+                let time4 = Unix.gettimeofday () in
+                printf "pretty printing took %f seconds\n" (time4 -. time3);
+                print_endline (CicNotationPp.pp_term t'); flush stdout
+                )
 (*                 CicNotationParser.print_l2_pattern ()) *)
         | 1 -> ignore (CicNotationParser.parse_syntax_pattern istream)
         | 2 ->