X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_notation%2Ftest_parser.ml;h=58880b9d5b781279600bda07825dbb2cb652742d;hb=acf29bdbdcdc6ad8c2d9d27e8a47500981b605cd;hp=d39c0ff94d86526e84e206dba739b38655e9480f;hpb=e9cfecee7dd7cf8388512ffd4aa223782c728eda;p=helm.git

diff --git a/helm/ocaml/cic_notation/test_parser.ml b/helm/ocaml/cic_notation/test_parser.ml
index d39c0ff94..58880b9d5 100644
--- a/helm/ocaml/cic_notation/test_parser.ml
+++ b/helm/ocaml/cic_notation/test_parser.ml
@@ -25,46 +25,16 @@
 
 open Printf
 
+let _ =
+  Helm_registry.load_from "test_parser.conf.xml"
+(*   Http_getter.init () *)
+
 let _ =
   let module P = CicNotationPt in
   let level = ref ~-1 in
   let arg_spec = [ "-level", Arg.Set_int level, "set the notation level" ] in
   let usage = "test_parser -level { 1 | 2 | 3 }" in
   Arg.parse arg_spec (fun _ -> raise (Arg.Bad usage)) usage;
-  if !level = 2 then begin
-    let id =
-      CicNotationParser.extend ~precedence:50 ~associativity:Gramext.LeftA
-        (P.Layout (P.Box (P.H,
-          [
-            P.Magic
-              (P.List1
-                (P.Layout (P.Box (P.H,
-                  [ P.Literal (`Symbol "|");
-                    P.Variable (P.TermVar "ugo");
-                    P.Magic (P.Opt (P.Layout (P.Box (P.H,
-                      [ P.Literal (`Symbol ",");
-                        P.Variable (P.TermVar "pino")]))));
-                    P.Literal (`Symbol "|");
-                  ])),
-                  Some (`Symbol ";")));
-(*             P.Literal (`Symbol "+");
-            P.Magic (P.Opt (P.Layout (P.Box (P.H,
-              [
-                P.Variable (P.TermVar "ugo");
-                P.Literal (`Symbol "+");
-                P.Variable (P.TermVar "pino")
-              ])))); *)
-(*           P.Variable (P.TermVar "a");
-            P.Literal (`Symbol "+");
-            P.Variable (P.TermVar "b"); *)
-          ])))
-        (fun env _ ->
-          prerr_endline "reducing rule" ;
-          prerr_endline (sprintf "env = [ %s ]" (CicNotationPp.pp_env env));
-          P.Sort `Prop)
-    in
-    CicNotationParser.print_l2_pattern ()
-  end;
   let ic = stdin in
   try
     printf "Parsing notation level %d\n" !level; flush stdout;
@@ -76,16 +46,60 @@ 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) ->
-                prerr_endline "foo";
-                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);
-                      CicNotationSubst.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);
+                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
+                let annobj, _, _, id_to_sort, _, _, _ =
+                  Cic2acic.acic_object_of_cic_object obj
+                in
+                let annterm =
+                  match annobj with
+                  | Cic.AConstant (_, _, _, _, ty, _, _)
+                  | Cic.AVariable (_, _, _, ty, _, _) -> ty
+                  | _ -> assert false
+                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);
+                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 ->