ocaml 3.09 transition

[helm.git] / helm / ocaml / cic_notation / test_parser.ml

diff --git a/helm/ocaml/cic_notation/test_parser.ml b/helm/ocaml/cic_notation/test_parser.ml
index 960af9d5fddb846b1c17a36e0e3abbdd3b81888f..b3685232e8e96e3a898e6a361bc9dd940cb63601 100644 (file)
--- a/helm/ocaml/cic_notation/test_parser.ml
+++ b/helm/ocaml/cic_notation/test_parser.ml
@@ -39,7 +39,9 @@ let dump_xml t id_to_uri fname =
   prerr_endline (sprintf "dumping MathML to %s ..." fname);
   flush stdout;
   let oc = open_out fname in
-  Xml.pp_to_outchan (CicNotationPres.render_to_boxml id_to_uri t) oc;
+  let markup = CicNotationPres.render id_to_uri t in
+  let xml_stream = CicNotationPres.print_xml markup in
+  Xml.pp_to_outchan xml_stream oc;
   close_out oc
 
 let extract_loc =
@@ -47,12 +49,6 @@ let extract_loc =
     | GrafiteAst.Executable (loc, _)
     | GrafiteAst.Comment (loc, _) -> loc
 
-let errquit ignore_exn =
-  if not ignore_exn then begin
-    prerr_endline "Error, exiting!";
-    exit 2
-  end
-
 let pp_associativity = function
   | Gramext.LeftA -> "left"
   | Gramext.RightA -> "right"
@@ -60,18 +56,28 @@ let pp_associativity = function
 
 let pp_precedence = string_of_int
 
-let process_stream ?(ignore_exn = false) istream =
+(* let last_rule_id = ref None *)
+
+let process_stream istream =
   let char_count = ref 0 in
   let module P = CicNotationPt in
   let module G = GrafiteAst in
     try
-      while Stream.peek istream <> None do
+      while true do
         try
           let statement = GrafiteParser.parse_statement istream in
           let floc = extract_loc statement in
           let (_, y) = P.loc_of_floc floc in
           char_count := y + !char_count;
           match statement with
+(*           | G.Executable (_, G.Macro (_, G.Check (_,
+            P.AttributedTerm (_, P.Ident _)))) -> 
+              prerr_endline "mega hack";
+              (match !last_rule_id with
+              | None -> ()
+              | Some id ->
+                  prerr_endline "removing last notation rule ...";
+                  CicNotationParser.delete id) *)
           | G.Executable (_, G.Macro (_, G.Check (_, t))) -> 
               prerr_endline (sprintf "ast: %s" (CicNotationPp.pp_term t));
               let t' = CicNotationRew.pp_ast t in
@@ -80,7 +86,7 @@ let process_stream ?(ignore_exn = false) istream =
               let tbl = Hashtbl.create 0 in
               dump_xml t' tbl "out.xml"
           | G.Executable (_, G.Command (_,
-            G.Notation (_, l1, associativity, precedence, l2))) ->
+            G.Notation (_, dir, l1, associativity, precedence, l2))) ->
               prerr_endline "notation";
               prerr_endline (sprintf "l1: %s" (CicNotationPp.pp_term l1));
               prerr_endline (sprintf "l2: %s" (CicNotationPp.pp_term l2));
@@ -90,10 +96,14 @@ let process_stream ?(ignore_exn = false) istream =
               if keywords <> [] then
                 prerr_endline (sprintf "keywords: %s"
                   (String.concat " " keywords));
-              ignore (CicNotationParser.extend l1 ?precedence ?associativity
-                (fun env loc -> CicNotationFwd.instantiate_level2 env l2));
-              ignore (CicNotationRew.add_pretty_printer
-                ?precedence ?associativity l2 l1)
+              if dir <> Some `RightToLeft then
+                ignore
+                  (CicNotationParser.extend l1 ?precedence ?associativity
+                    (fun env loc -> CicNotationFwd.instantiate_level2 env l2));
+(*               last_rule_id := Some rule_id; *)
+              if dir <> Some `LeftToRight then
+                ignore (CicNotationRew.add_pretty_printer
+                  ?precedence ?associativity l2 l1)
           | G.Executable (_, G.Command (_, G.Interpretation (_, id, l2, l3))) ->
               prerr_endline "interpretation";
               prerr_endline (sprintf "dsc: %s" id);
@@ -115,9 +125,10 @@ let process_stream ?(ignore_exn = false) istream =
               let t, id_to_uri =
                 CicNotationRew.ast_of_acic id_to_sort annterm
               in
-              prerr_endline "AST";
+              prerr_endline "Raw AST";
               prerr_endline (CicNotationPp.pp_term t);
               let t' = CicNotationRew.pp_ast t in
+              prerr_endline "Rendered AST";
               prerr_endline (CicNotationPp.pp_term t');
               dump_xml t' id_to_uri "out.xml"
           | _ -> prerr_endline "Unsupported statement"
@@ -131,15 +142,12 @@ let process_stream ?(ignore_exn = false) istream =
             eprintf "%s\e[01;31m%s\e[00m%s\n" before error after;
             prerr_endline (sprintf "at character %d-%d: %s" x y msg) *)
             prerr_endline (sprintf "Parse error at character %d-%d: %s"
-              (!char_count + x) (!char_count + y) msg);
-            errquit ignore_exn
+              (!char_count + x) (!char_count + y) msg)
         | exn ->
             prerr_endline
-              (sprintf "Uncaught exception: %s" (Printexc.to_string exn));
-            errquit ignore_exn
+              (sprintf "Uncaught exception: %s" (Printexc.to_string exn))
        done
-    with End_of_file ->
-      ()
+    with End_of_file -> ()
 
 let _ =
   let arg_spec = [ ] in
@@ -149,5 +157,5 @@ let _ =
   CicNotation.load_notation (Helm_registry.get "notation.core_file");
   print_endline "done.";
   flush stdout;
-  process_stream ~ignore_exn:false (Stream.of_channel stdin)
+  process_stream (Ulexing.from_utf8_channel stdin)