X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FgTopLevel%2FbatchParser.ml;h=0d959ac6540861dbd31bdb9843079ca89a56673f;hb=947e7893dbb23fcaa998266ee8dd9a32b27d3b6e;hp=1e301eaf945aa234146fef04e756105959f2525e;hpb=29c4c207d66c4643e642abc8f70efd40aadc499d;p=helm.git

diff --git a/helm/gTopLevel/batchParser.ml b/helm/gTopLevel/batchParser.ml
index 1e301eaf9..0d959ac65 100644
--- a/helm/gTopLevel/batchParser.ml
+++ b/helm/gTopLevel/batchParser.ml
@@ -28,15 +28,29 @@ let verbose = false
 exception Failure of string
 let fail msg = raise (Failure msg)
 
-let constants_only uri = not (String.sub uri (String.length uri - 4) 4 = ".var")
-let uri_predicate = ref constants_only
+let constants_only ~prefix =
+ let test_prefix =
+  if prefix = "" then
+   (fun _ -> true)
+  else
+   (fun uri -> Pcre.pmatch ~rex:(Pcre.regexp ("^" ^ prefix)) uri)
+ in
+ fun uri ->
+  test_prefix uri && (not (String.sub uri (String.length uri - 4) 4 = ".var"))
+
+let uri_predicate = ref (constants_only ~prefix:"")
 
-let uri_pred_of_conf tryvars varsprefix =
+let uri_pred_of_conf tryvars ~prefix ~varsprefix =
   if not tryvars then
-    constants_only
+    constants_only ~prefix
   else
-    let rex = Pcre.regexp ("^" ^ varsprefix) in
-    (fun uri -> Pcre.pmatch ~rex uri)
+    let test_prefix = Pcre.pmatch ~rex:(Pcre.regexp ("^" ^ prefix)) in
+    let test_varsprefix = Pcre.pmatch ~rex:(Pcre.regexp ("^" ^ varsprefix)) in
+     fun uri ->
+      if String.sub uri (String.length uri - 4) 4 = ".var" then
+       test_varsprefix uri
+      else
+       test_prefix uri
 
 module DisambiguateCallbacks =
  struct
@@ -44,17 +58,20 @@ module DisambiguateCallbacks =
    ~selection_mode ?ok ?enable_button_for_non_vars ~title ~msg ~id choices =
      List.filter !uri_predicate choices
 
-  let interactive_interpretation_choice _ = fail "Multiple interpretations"
+  let interactive_interpretation_choice =
+   let rec aux n =
+    function
+       [] -> []
+     | _::tl -> n::(aux (n+1) tl)
+   in
+    aux 0
+
   let input_or_locate_uri ~title = fail "Unknown identifier"
  end
 
 module Disambiguate' = DisambiguatingParser.Make (DisambiguateCallbacks)
 
-let mqi_debug_fun = ignore
-let mqi_flags = []
-
-let parse ?(uri_pred = constants_only) =
-  let mqi_handle = MQIConn.init mqi_flags mqi_debug_fun in
+let parse mqi_handle ?(uri_pred = constants_only ~prefix:"") =
   uri_predicate := uri_pred;
   let empty_environment =
     DisambiguatingParser.EnvironmentP3.of_string
@@ -63,11 +80,10 @@ let parse ?(uri_pred = constants_only) =
   let empty_context = [] in
   let empty_metasenv = [] in
   fun input ->
-    let (_, metasenv, term) =
-      Disambiguate'.disambiguate_term
-        mqi_handle empty_context empty_metasenv input empty_environment
-    in
-    MQIConn.close mqi_handle; (metasenv, term)
+   (Disambiguate'.disambiguate_term
+     mqi_handle empty_context empty_metasenv input empty_environment)
 
-let parse_pp ?uri_pred input = CicPp.ppterm (snd (parse ?uri_pred input))
+let parse_pp mqi_handle ?uri_pred input = 
+ List.map (fun (_,_,t) -> CicPp.ppterm t)
+  (parse mqi_handle ?uri_pred input)