ported to new module names

diff --git a/helm/ocaml/cic_disambiguation/test_lexer.ml b/helm/ocaml/cic_disambiguation/test_lexer.ml
index 2c43357499569f1a6d8fabe6e749a02c8f66be1e..520829d87b91cabcabf93589d05b5ced0afda1e5 100644 (file)
--- a/helm/ocaml/cic_disambiguation/test_lexer.ml
+++ b/helm/ocaml/cic_disambiguation/test_lexer.ml
@@ -28,7 +28,9 @@ let ic =
     open_in Sys.argv.(1)
   with Invalid_argument _ -> stdin
 in
-let token_stream = fst (Lexer.lex.Token.tok_func (Stream.of_channel ic)) in
+let token_stream =
+  fst (CicTextualLexer2.lex.Token.tok_func (Stream.of_channel ic))
+in
 let rec dump () =
   let (a,b) = Stream.next token_stream in
   if a = "EOI" then raise Stream.Failure;

diff --git a/helm/ocaml/cic_disambiguation/test_parser.ml b/helm/ocaml/cic_disambiguation/test_parser.ml
index 0f6b2d162c07ab05d4fd1b21b21b8e6a26bcad52..1813fd641457953419cb74324ca1312eda26c082 100644 (file)
--- a/helm/ocaml/cic_disambiguation/test_parser.ml
+++ b/helm/ocaml/cic_disambiguation/test_parser.ml
@@ -29,14 +29,10 @@ try
       open_in Sys.argv.(1)
     with Invalid_argument _ -> stdin)
   in
-  let term = Parser.parse_term (Stream.of_channel ic) in
+  let term = CicTextualParser2.parse_term (Stream.of_channel ic) in
   close_in ic;
-  print_endline (Pp.pp_term term)
+  print_endline (CicTextualParser2Pp.pp_term term)
 with Stdpp.Exc_located ((p_start, p_end), exn) ->
   prerr_endline (Printf.sprintf "Exception at character %d-%d: %s"
                   p_start p_end (Printexc.to_string exn))
 
-(* print_endline (Macro.expand "def") *)
-
-(* Printf.printf "'%s'\n" (Macro.expand Sys.argv.(1)) *)
-