New CicTextualParser: it now returns (approximately) a couple

[helm.git] / helm / ocaml / cic_textual_parser / cicTextualParserContext.ml

diff --git a/helm/ocaml/cic_textual_parser/cicTextualParserContext.ml b/helm/ocaml/cic_textual_parser/cicTextualParserContext.ml
index ae21e5d2e0e8193bcd78da63708634e8609cf955..c51346e1ac3940625b7866df6bb7f0d6a3a77e01 100644 (file)
--- a/helm/ocaml/cic_textual_parser/cicTextualParserContext.ml
+++ b/helm/ocaml/cic_textual_parser/cicTextualParserContext.ml
@@ -23,11 +23,18 @@
  * http://cs.unibo.it/helm/.
  *)
 
-let main ~current_uri ~context lexer lexbuf =
+let main ~context ~metasenv lexer lexbuf ~register_aliases =
  (* Warning: higly non-reentrant code!!! *)
- CicTextualParser0.current_uri := current_uri ;
  CicTextualParser0.binders := context ;
- let res = CicTextualParser.main lexer lexbuf in
-  CicTextualParser0.binders := [] ;
-  res
+ CicTextualParser0.metasenv := metasenv ;
+ match CicTextualParser.main lexer lexbuf register_aliases with
+    None -> None
+  | Some (dom,mk_term) ->
+     Some
+      (dom,
+        function interp ->
+         let term = mk_term interp in 
+         let metasenv = !CicTextualParser0.metasenv in
+          metasenv,term
+      )
 ;;