X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FgTopLevel%2FtermEditor.ml;h=3a74ef05111ce88f2948052896e5ce47a9fc598e;hb=741b3e9014f940fbbd34bee7b606ff7e72170452;hp=ca5cca601e615c6daf96b5bdcaff3f525852e1d3;hpb=12809955a4a6c693072f5b924603165f83cc382e;p=helm.git

diff --git a/helm/gTopLevel/termEditor.ml b/helm/gTopLevel/termEditor.ml
index ca5cca601..3a74ef051 100644
--- a/helm/gTopLevel/termEditor.ml
+++ b/helm/gTopLevel/termEditor.ml
@@ -48,10 +48,10 @@ 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);;
@@ -61,7 +61,9 @@ module Make(C:Disambiguate_types.Callbacks) =
    =
     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 =
+         match
           Disambiguate'.disambiguate_term mqi_handle context metasenv
            (input#buffer#get_text ()) !environment
+         with
+            [environment',metasenv,expr] -> environment',metasenv,expr
+          | _ -> assert false
         in
         environment := environment';
         (metasenv, expr)