X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_notation%2Ftest_parser.ml;h=5b42822c22b218d2495b4f32fe9d038f8a113ff3;hb=50377dde5b5b1a8e5c7b2fb48b47defde9508b50;hp=26ece217d9240337876e525f27c339ac32798cc1;hpb=a907911788bf1229fbf04e3125e0c1755f90d96a;p=helm.git

diff --git a/helm/ocaml/cic_notation/test_parser.ml b/helm/ocaml/cic_notation/test_parser.ml
index 26ece217d..5b42822c2 100644
--- a/helm/ocaml/cic_notation/test_parser.ml
+++ b/helm/ocaml/cic_notation/test_parser.ml
@@ -26,8 +26,8 @@
 open Printf
 
 let _ =
-  Helm_registry.set "getter.mode" "remote";
-  Helm_registry.set "getter.url" "http://helm.cs.unibo.it:58081/"
+  Helm_registry.load_from "test_parser.conf.xml";
+  Http_getter.init ()
 
 let _ =
   let module P = CicNotationPt in
@@ -80,25 +80,37 @@ 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
-                ignore (CicNotationRew.add_interpretation l2 l3);
+(*                 ignore (CicNotationRew.add_interpretation l2 l3); *)
                 let time2 = Unix.gettimeofday () in
                 printf "done (patterns compilation took %f seconds)\n"
                   (time2 -. time1);
                 flush stdout
             | P.Render uri ->
-                let obj, _ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in
+                assert false
+(*                 let obj, _ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in
                 let annobj, _, _, id_to_sort, _, _, _ =
                   Cic2acic.acic_object_of_cic_object obj
                 in
@@ -114,7 +126,15 @@ let _ =
                 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 ->