- disambiguation now needs DBI handle

- no longer build by default old cic_textual_parser

diff --git a/helm/gTopLevel/disambiguatingParser.ml.in b/helm/gTopLevel/disambiguatingParser.ml.in
index 6ba3b26ee8bf620afa36bbbb151a84ebdfa290fe..dfab60433c75d285dd38e1590071d7303fa68dc9 100644 (file)
--- a/helm/gTopLevel/disambiguatingParser.ml.in
+++ b/helm/gTopLevel/disambiguatingParser.ml.in
@@ -31,19 +31,19 @@ module AndreaAndZackDisambiguatingParser =
 
   module Make (C : DisambiguateTypes.Callbacks) =
    struct
-    let
-     disambiguate_term mqi_handle context metasenv term_as_string environment
+    let disambiguate_term ~(dbh:Dbi.connection) context metasenv term_as_string
+      aliases
     =
-     let module Disambiguate' = Disambiguate.Make (C) in
+      let module Disambiguate' = Disambiguate.Make (C) in
       let term =
-       CicTextualParser2.parse_term (Stream.of_string term_as_string)
+        CicTextualParser2.parse_term (Stream.of_string term_as_string)
       in
-       Disambiguate'.disambiguate_term
-        mqi_handle context metasenv term environment
+      Disambiguate'.disambiguate_term ~dbh context metasenv term ~aliases
    end
  end
 
 
+(*
 module CSCTextualDisambiguatingParser =
  struct
   module EnvironmentP3 = OldDisambiguate.EnvironmentP3
@@ -97,6 +97,7 @@ module CSCTexDisambiguatingParser =
           context metasenv dom mk_metasenv_and_expr environment
    end
  end
+*)
 
 @CHOSEN_TERM_PARSER@
 

diff --git a/helm/gTopLevel/disambiguatingParser.mli b/helm/gTopLevel/disambiguatingParser.mli
index 620198a527777da5806d2cdee880cc1dcdc4a97b..53b885088d4cfba8fac7f9db2285d7a6eab56bc5 100644 (file)
--- a/helm/gTopLevel/disambiguatingParser.mli
+++ b/helm/gTopLevel/disambiguatingParser.mli
@@ -36,7 +36,7 @@ module EnvironmentP3 :
 module Make (C : DisambiguateTypes.Callbacks) :
   sig
     val disambiguate_term :
-      MQIConn.handle ->
+      dbh:Dbi.connection ->
       Cic.context ->
       Cic.metasenv ->
       string ->