X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Focaml%2Fcic_notation%2Ftest_parser.ml;h=e4db4d503d986bd842008d5f32970fb58993d35c;hb=9230a8085102cd39258c047949e87001be6ffcf0;hp=c068491a38898c07e5c7fc1f89c263f9d2b688ba;hpb=aca103d3c3d740efcc0bcc2932922cff77facb49;p=helm.git

diff --git a/helm/ocaml/cic_notation/test_parser.ml b/helm/ocaml/cic_notation/test_parser.ml
index c068491a3..e4db4d503 100644
--- a/helm/ocaml/cic_notation/test_parser.ml
+++ b/helm/ocaml/cic_notation/test_parser.ml
@@ -25,11 +25,6 @@
 
 open Printf
 
-(* cut and past from CicAst.loc_of_floc *)
-let loc_of_floc = function
-  | { Lexing.pos_cnum = loc_begin }, { Lexing.pos_cnum = loc_end } ->
-      (loc_begin, loc_end)
-
 let _ =
   let module P = CicNotationPt in
   let level = ref ~-1 in
@@ -40,42 +35,36 @@ let _ =
     let id =
       CicNotationParser.extend ~precedence:50 ~associativity:Gramext.LeftA
         (P.Layout (P.Box (P.H,
-          [ P.Literal (`Symbol "+");
-            P.Magic (P.Opt (P.Variable (P.TermVar "ugo"))) ]
-(*           [ P.Variable (P.TermVar "a");
+          [
+            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");
-          ] *)
-            )))
+            P.Variable (P.TermVar "b"); *)
+          ])))
         (fun env _ ->
-          begin
           prerr_endline "reducing rule" ;
-          prerr_endline (sprintf "env = [ %s ]" (CicNotationParser.pp_env env));
-(*           match env with
-          [(x, (_, P.OptValue v))] ->
-              begin
-                match v with
-                Some _ -> Printf.printf "Ugo c'e'? %s\n" x; flush stdout
-                | None  -> prerr_endline "nooooo"
-              end
-           | _ -> assert false *)
-          end ;
+          prerr_endline (sprintf "env = [ %s ]" (CicNotationPp.pp_env env));
           P.Sort `Prop)
     in
     CicNotationParser.print_l2_pattern ()
   end;
-  let parse_fun s =
-    match !level with
-    | 1 -> ignore (CicNotationParser.parse_syntax_pattern s)
-    | 2 ->
-        let ast = CicNotationParser.parse_ast_pattern s in
-        if ast = P.Sort `Prop then
-          prerr_endline "eureka (ma sono cazzi)"
-        else
-          prerr_endline ":-("
-    | 3 -> ignore (CicNotationParser.parse_interpretation s)
-    | _ -> Arg.usage arg_spec usage; exit 1
-  in
   let ic = stdin in
   try
     printf "Parsing notation level %d\n" !level; flush stdout;
@@ -83,10 +72,32 @@ let _ =
       let line = input_line ic in
       let istream = Stream.of_string line in
       try
-        parse_fun istream;
-        print_endline ">"
+        (match !level with
+        | -1 ->
+            (match CicNotationParser.parse_phrase istream with
+            | P.Print t -> 
+                print_endline (CicNotationPp.pp_term t); flush stdout
+            | P.Notation (l1, associativity, precedence, l2) ->
+                prerr_endline "foo";
+                print_endline "Extending notation ..."; flush stdout;
+                ignore
+                  (CicNotationParser.extend l1 ?precedence ?associativity
+                    (fun env loc ->
+                      prerr_endline "ENV";
+                      prerr_endline (CicNotationPp.pp_env env);
+                      CicNotationEnv.instantiate env l2));
+                CicNotationParser.print_l2_pattern ())
+        | 1 -> ignore (CicNotationParser.parse_syntax_pattern istream)
+        | 2 ->
+            let ast = CicNotationParser.parse_ast_pattern istream in
+            if ast = P.Sort `Prop then
+              prerr_endline "eureka"
+            else
+              prerr_endline ":-("
+        | 3 -> ignore (CicNotationParser.parse_interpretation istream)
+        | _ -> Arg.usage arg_spec usage; exit 1);
       with CicNotationParser.Parse_error (floc, msg) ->
-        let (x, y) = loc_of_floc floc in
+        let (x, y) = P.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