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
module Disambiguate' = DisambiguatingParser.Make (DisambiguateCallbacks)
-let parse mqi_handle ?(uri_pred = constants_only) =
+let parse mqi_handle ?(uri_pred = constants_only ~prefix:"") =
uri_predicate := uri_pred;
let empty_environment =
DisambiguatingParser.EnvironmentP3.of_string
let empty_context = [] in
let empty_metasenv = [] in
fun input ->
- List.map (fun (_,metasenv,term) -> metasenv,term)
- (Disambiguate'.disambiguate_term
- mqi_handle empty_context empty_metasenv input empty_environment)
+ (Disambiguate'.disambiguate_term
+ mqi_handle empty_context empty_metasenv input empty_environment)
let parse_pp mqi_handle ?uri_pred input =
- List.map (fun (_,t) -> CicPp.ppterm t)
+ List.map (fun (_,_,t) -> CicPp.ppterm t)
(parse mqi_handle ?uri_pred input)