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
~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 dbd ?(uri_pred = constants_only ~prefix:"") =
uri_predicate := uri_pred;
let empty_environment =
DisambiguatingParser.EnvironmentP3.of_string
in
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)
+ fun input ugraph ->
+ (Disambiguate'.disambiguate_term
+ ~dbd empty_context empty_metasenv input empty_environment
+ ~initial_ugraph:ugraph)
-let parse_pp ?uri_pred input = CicPp.ppterm (snd (parse ?uri_pred input))
+let parse_pp dbd ?uri_pred input ugraph =
+ List.map (fun (_,_,t,_) -> CicPp.ppterm t)
+ (parse dbd ?uri_pred input ugraph )