ported to Dbi-disambiguation

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

diff --git a/helm/gTopLevel/termEditor.ml b/helm/gTopLevel/termEditor.ml
index ca5cca601e615c6daf96b5bdcaff3f525852e1d3..e7b50c2662efadad81dcfb91615bc6cb505d200b 100644 (file)
--- a/helm/gTopLevel/termEditor.ml
+++ b/helm/gTopLevel/termEditor.ml
@@ -48,20 +48,22 @@ class type term_editor =
    method reset : unit
    (* The input of set_term is unquoted *)
    method set_term : string -> unit
-   method environment : DisambiguatingParser.Environment.t ref
+   method environment : DisambiguatingParser.EnvironmentP3.t ref
  end
 
-module Make(C:Disambiguate_types.Callbacks) =
+module Make(C:DisambiguateTypes.Callbacks) =
   struct
 
    module Disambiguate' = DisambiguatingParser.Make(C);;
 
-   class term_editor_impl mqi_handle ?packing ?width ?height
+   class term_editor_impl ~(dbh:Dbi.connection) ?packing ?width ?height
     ?isnotempty_callback ?share_environment_with () : term_editor
    =
     let environment =
      match share_environment_with with
-        None -> ref DisambiguatingParser.Environment.empty
+        None -> ref
+          (DisambiguatingParser.EnvironmentP3.of_string
+            DisambiguatingParser.EnvironmentP3.empty)
       | Some obj -> obj#environment
     in
     let input = GText.view ~editable:true ?width ?height ?packing () in
@@ -97,8 +99,12 @@ module Make(C:Disambiguate_types.Callbacks) =
          ) context
        in
         let environment',metasenv,expr =
-          Disambiguate'.disambiguate_term mqi_handle context metasenv
+         match
+          Disambiguate'.disambiguate_term ~dbh context metasenv
            (input#buffer#get_text ()) !environment
+         with
+            [environment',metasenv,expr] -> environment',metasenv,expr
+          | _ -> assert false
         in
         environment := environment';
         (metasenv, expr)