ported to svn-cvs merge

diff --git a/helm/gTopLevel/.depend b/helm/gTopLevel/.depend
index 8bc736bea043653e79d5a1e2305a630081bedd80..d28c5220f8c586e7708eb450858cd56778e18e43 100644 (file)
--- a/helm/gTopLevel/.depend
+++ b/helm/gTopLevel/.depend
@@ -1,6 +1,6 @@
 termEditor.cmi: disambiguatingParser.cmi 
 texTermEditor.cmi: disambiguatingParser.cmi 
-invokeTactics.cmi: termEditor.cmi termViewer.cmi 
+invokeTactics.cmi: termViewer.cmi termEditor.cmi 
 hbugs.cmi: invokeTactics.cmi 
 chosenTermEditor.cmi: disambiguatingParser.cmi 
 proofEngine.cmo: proofEngine.cmi 
@@ -13,26 +13,28 @@ termEditor.cmo: disambiguatingParser.cmi termEditor.cmi
 termEditor.cmx: disambiguatingParser.cmx termEditor.cmi 
 texTermEditor.cmo: disambiguatingParser.cmi texTermEditor.cmi 
 texTermEditor.cmx: disambiguatingParser.cmx texTermEditor.cmi 
+chosenTransformer.cmo: chosenTransformer.cmi 
+chosenTransformer.cmx: chosenTransformer.cmi 
 termViewer.cmo: logicalOperations.cmi termViewer.cmi 
 termViewer.cmx: logicalOperations.cmx termViewer.cmi 
-invokeTactics.cmo: logicalOperations.cmi proofEngine.cmi termEditor.cmi \
-    termViewer.cmi invokeTactics.cmi 
-invokeTactics.cmx: logicalOperations.cmx proofEngine.cmx termEditor.cmx \
-    termViewer.cmx invokeTactics.cmi 
-hbugs.cmo: invokeTactics.cmi proofEngine.cmi hbugs.cmi 
-hbugs.cmx: invokeTactics.cmx proofEngine.cmx hbugs.cmi 
+invokeTactics.cmo: termViewer.cmi termEditor.cmi proofEngine.cmi \
+    logicalOperations.cmi invokeTactics.cmi 
+invokeTactics.cmx: termViewer.cmx termEditor.cmx proofEngine.cmx \
+    logicalOperations.cmx invokeTactics.cmi 
+hbugs.cmo: proofEngine.cmi invokeTactics.cmi hbugs.cmi 
+hbugs.cmx: proofEngine.cmx invokeTactics.cmx hbugs.cmi 
 chosenTermEditor.cmo: termEditor.cmi chosenTermEditor.cmi 
 chosenTermEditor.cmx: termEditor.cmx chosenTermEditor.cmi 
 helmGtkLogger.cmo: helmGtkLogger.cmi 
 helmGtkLogger.cmx: helmGtkLogger.cmi 
-gTopLevel.cmo: chosenTermEditor.cmi disambiguatingParser.cmi hbugs.cmi \
-    helmGtkLogger.cmi invokeTactics.cmi logicalOperations.cmi proofEngine.cmi \
-    termEditor.cmi termViewer.cmi 
-gTopLevel.cmx: chosenTermEditor.cmx disambiguatingParser.cmx hbugs.cmx \
-    helmGtkLogger.cmx invokeTactics.cmx logicalOperations.cmx proofEngine.cmx \
-    termEditor.cmx termViewer.cmx 
-regtest.cmo: batchParser.cmi disambiguatingParser.cmi 
-regtest.cmx: batchParser.cmx disambiguatingParser.cmx 
+gTopLevel.cmo: termViewer.cmi termEditor.cmi proofEngine.cmi \
+    logicalOperations.cmi invokeTactics.cmi helmGtkLogger.cmi hbugs.cmi \
+    disambiguatingParser.cmi chosenTermEditor.cmi 
+gTopLevel.cmx: termViewer.cmx termEditor.cmx proofEngine.cmx \
+    logicalOperations.cmx invokeTactics.cmx helmGtkLogger.cmx hbugs.cmx \
+    disambiguatingParser.cmx chosenTermEditor.cmx 
+regtest.cmo: disambiguatingParser.cmi batchParser.cmi 
+regtest.cmx: disambiguatingParser.cmx batchParser.cmx 
 testlibrary.cmo: batchParser.cmi 
 testlibrary.cmx: batchParser.cmx 
 batchParser.cmo: disambiguatingParser.cmi batchParser.cmi 

diff --git a/helm/gTopLevel/disambiguatingParser.mli b/helm/gTopLevel/disambiguatingParser.mli
index 3d2c91f25bca396d84a84a09c202b8be2d4dd401..710401f4a35f01383e8a8fc141160b5408ecf6ec 100644 (file)
--- a/helm/gTopLevel/disambiguatingParser.mli
+++ b/helm/gTopLevel/disambiguatingParser.mli
@@ -37,11 +37,11 @@ module Make (C : DisambiguateTypes.Callbacks) :
   sig
     val disambiguate_term :
       dbd:Mysql.dbd ->
-      Cic.context ->
-      Cic.metasenv ->
-      string ->
-      EnvironmentP3.t ->  (* previous interpretation status *)
+      context:Cic.context ->
+      metasenv:Cic.metasenv ->
       ?initial_ugraph:CicUniv.universe_graph ->
+      aliases:EnvironmentP3.t ->  (* previous interpretation status *)
+      string ->
       (EnvironmentP3.t *               (* new interpretation status *)
        Cic.metasenv *                  (* new metasenv *)
        Cic.term *

diff --git a/helm/gTopLevel/termEditor.ml b/helm/gTopLevel/termEditor.ml
index 4cca702219db51e0a4e9abdba72cb1cd5a4c348b..1b9986caa294184335c6bb697be47b35a6e0a26a 100644 (file)
--- a/helm/gTopLevel/termEditor.ml
+++ b/helm/gTopLevel/termEditor.ml
@@ -101,9 +101,9 @@ module Make(C:DisambiguateTypes.Callbacks) =
        in
         let environment',metasenv,expr,ugraph =
          match
-          Disambiguate'.disambiguate_term ~dbd context metasenv
+          Disambiguate'.disambiguate_term ~dbd ~context ~metasenv
            (input#buffer#get_text ()) ~initial_ugraph:CicUniv.empty_ugraph
-           !environment
+           ~aliases:!environment
          with
             [environment',metasenv,expr,u] -> environment',metasenv,expr,u
           | _ -> assert false

diff --git a/helm/gTopLevel/texTermEditor.ml b/helm/gTopLevel/texTermEditor.ml
index a59fb3489b2ca0679cac61073c2b6723cfbd0902..5ea965f2fd76c01ffd0c3e23f3210afe8aa38acb 100644 (file)
--- a/helm/gTopLevel/texTermEditor.ml
+++ b/helm/gTopLevel/texTermEditor.ml
@@ -221,8 +221,8 @@ module Make(C:DisambiguateTypes.Callbacks) =
         let environment',metasenv,expr,ugraph =
          match
           Disambiguate'.disambiguate_term ~dbd
-           context metasenv (Mathml_editor.get_tex tex_editor) 
-           ~initial_ugraph:CicUniv.empty_ugraph !environment
+           ~context ~metasenv (Mathml_editor.get_tex tex_editor) 
+           ~initial_ugraph:CicUniv.empty_ugraph ~aliases:!environment
          with
             [environment',metasenv,expr,u] -> environment',metasenv,expr,u
           | _ -> assert false