ocaml 3.09 transition

[helm.git] / helm / gTopLevel / texTermEditor.ml

diff --git a/helm/gTopLevel/texTermEditor.ml b/helm/gTopLevel/texTermEditor.ml
index 825b79e122671a3ed7fcbc1e224f0ff82f8e9ce6..5ea965f2fd76c01ffd0c3e23f3210afe8aa38acb 100644 (file)
--- a/helm/gTopLevel/texTermEditor.ml
+++ b/helm/gTopLevel/texTermEditor.ml
@@ -45,7 +45,8 @@ class type term_editor =
    method get_as_string : string
    method get_metasenv_and_term :
      context:Cic.context ->
-     metasenv:Cic.metasenv -> Cic.metasenv * Cic.term
+     metasenv:Cic.metasenv -> 
+     Cic.metasenv * Cic.term * CicUniv.universe_graph
    method reset : unit
    (* The input of set_term is unquoted *)
    method set_term : string -> unit
@@ -59,7 +60,7 @@ module Make(C:DisambiguateTypes.Callbacks) =
    module Disambiguate' = DisambiguatingParser.Make(C);;
 
    class term_editor_impl
-    ~dbh
+    ~dbd
     ?packing ?width ?height
     ?isnotempty_callback ?share_environment_with () : term_editor
    =
@@ -217,16 +218,17 @@ module Make(C:DisambiguateTypes.Callbacks) =
          ) context
        in
         debug_print ("TexTermEditor: Raw Tex: " ^ (Mathml_editor.get_tex tex_editor)) ;
-        let environment',metasenv,expr =
+        let environment',metasenv,expr,ugraph =
          match
-          Disambiguate'.disambiguate_term ~dbh 
-           context metasenv (Mathml_editor.get_tex tex_editor) !environment
+          Disambiguate'.disambiguate_term ~dbd
+           ~context ~metasenv (Mathml_editor.get_tex tex_editor) 
+           ~initial_ugraph:CicUniv.empty_ugraph ~aliases:!environment
          with
-            [environment',metasenv,expr] -> environment',metasenv,expr
+            [environment',metasenv,expr,u] -> environment',metasenv,expr,u
           | _ -> assert false
         in
          environment := environment' ;
-         metasenv,expr
+         metasenv,expr,ugraph
 
       method environment = environment
    end