(Pcre.replace ~rex:uscore_RE ~templ:"\\_"
shellglob)))
-let nonvar s =
- let len = String.length s in
- let suffix = String.sub s (len-4) 4 in
- not (suffix = ".var")
+let nonvar uri = not (UriManager.uri_is_var uri)
let locate ~(dbd:Mysql.dbd) ?(vars = false) pat =
let sql_pat = sqlpat_of_shellglob pat in
let result = Mysql.exec dbd query in
List.filter nonvar
(Mysql.map result
- (fun cols -> match cols.(0) with Some s -> s | _ -> assert false))
+ (fun cols -> match cols.(0) with Some s -> UriManager.uri_of_string s | _ -> assert false))
let match_term ~(dbd:Mysql.dbd) ty =
(* debug_print (CicPp.ppterm ty); *)
let metadata = MetadataExtractor.compute ~body:None ~ty in
let constants_no =
- MetadataConstraints.StringSet.cardinal (MetadataConstraints.constants_of ty)
+ MetadataConstraints.UriManagerSet.cardinal (MetadataConstraints.constants_of ty)
in
let full_card, diff =
if CicUtil.is_meta_closed ty then
| None -> set
| Some (_, Cic.Decl t)
| Some (_, Cic.Def (t, _)) ->
- Constr.StringSet.union set (Constr.constants_of t))
- Constr.StringSet.empty context
+ Constr.UriManagerSet.union set (Constr.constants_of t))
+ Constr.UriManagerSet.empty context
let intersect uris siguris =
- let set1 = List.fold_right Constr.StringSet.add uris Constr.StringSet.empty in
+ let set1 = List.fold_right Constr.UriManagerSet.add uris Constr.UriManagerSet.empty in
let set2 =
- List.fold_right Constr.StringSet.add siguris Constr.StringSet.empty
+ List.fold_right Constr.UriManagerSet.add siguris Constr.UriManagerSet.empty
in
- let inter = Constr.StringSet.inter set1 set2 in
- List.filter (fun s -> Constr.StringSet.mem s inter) uris
+ let inter = Constr.UriManagerSet.inter set1 set2 in
+ List.filter (fun s -> Constr.UriManagerSet.mem s inter) uris
let filter_uris_forward ~dbd (main, constants) uris =
let main_uris =
| Some (main, types) -> main :: types
in
let full_signature =
- List.fold_right Constr.StringSet.add main_uris constants
+ List.fold_right Constr.UriManagerSet.add main_uris constants
in
List.filter (Constr.at_most ~dbd ~where:`Statement full_signature) uris
let uris = List.filter Hashtbl_equiv.not_a_duplicate uris in
let types_constants =
match main with
- | None -> Constr.StringSet.empty
+ | None -> Constr.UriManagerSet.empty
| Some (main, types) ->
- List.fold_right Constr.StringSet.add (main :: types)
- Constr.StringSet.empty
+ List.fold_right Constr.UriManagerSet.add (main :: types)
+ Constr.UriManagerSet.empty
in
let hyp_constants =
- Constr.StringSet.diff (signature_of_hypothesis context) types_constants
+ Constr.UriManagerSet.diff (signature_of_hypothesis context) types_constants
in
-(* Constr.StringSet.iter debug_print hyp_constants; *)
- let other_constants = Constr.StringSet.union sig_constants hyp_constants in
+(* Constr.UriManagerSet.iter debug_print hyp_constants; *)
+ let other_constants = Constr.UriManagerSet.union sig_constants hyp_constants in
let uris =
- let pow = 2 ** (Constr.StringSet.cardinal other_constants) in
+ let pow = 2 ** (Constr.UriManagerSet.cardinal other_constants) in
if ((List.length uris < pow) or (pow <= 0))
then begin
(* debug_print "MetadataQuery: large sig, falling back to old method"; *)
of the experimentation we shall make a choice. *)
let close_with_types s metasenv context =
- Constr.StringSet.fold
+ Constr.UriManagerSet.fold
(fun e bag ->
let t = CicUtil.term_of_uri e in
let ty, _ =
CicTypeChecker.type_of_aux' metasenv context t CicUniv.empty_ugraph
in
- Constr.StringSet.union bag (Constr.constants_of ty))
+ Constr.UriManagerSet.union bag (Constr.constants_of ty))
s s
let experimental_hint
let uris = List.filter Hashtbl_equiv.not_a_duplicate uris in
let types_constants =
match main with
- | None -> Constr.StringSet.empty
+ | None -> Constr.UriManagerSet.empty
| Some (main, types) ->
- List.fold_right Constr.StringSet.add (main :: types)
- Constr.StringSet.empty
+ List.fold_right Constr.UriManagerSet.add (main :: types)
+ Constr.UriManagerSet.empty
in
let all_constants =
let hyp_and_sug =
- Constr.StringSet.union
+ Constr.UriManagerSet.union
(signature_of_hypothesis context)
sig_constants
in
let main =
match main with
- | None -> Constr.StringSet.empty
+ | None -> Constr.UriManagerSet.empty
| Some (main,_) ->
let ty, _ =
CicTypeChecker.type_of_aux'
in
Constr.constants_of ty
in
- Constr.StringSet.union main hyp_and_sug
+ Constr.UriManagerSet.union main hyp_and_sug
in
-(* Constr.StringSet.iter debug_print hyp_constants; *)
+(* Constr.UriManagerSet.iter debug_print hyp_constants; *)
let all_constants_closed = close_with_types all_constants metasenv context in
let other_constants =
- Constr.StringSet.diff all_constants_closed types_constants
+ Constr.UriManagerSet.diff all_constants_closed types_constants
in
debug_print "all_constants_closed";
- Constr.StringSet.iter debug_print all_constants_closed;
+ Constr.UriManagerSet.iter debug_print all_constants_closed;
debug_print "other_constants";
- Constr.StringSet.iter debug_print other_constants;
+ Constr.UriManagerSet.iter debug_print other_constants;
let uris =
- let pow = 2 ** (Constr.StringSet.cardinal other_constants) in
+ let pow = 2 ** (Constr.UriManagerSet.cardinal other_constants) in
if ((List.length uris < pow) or (pow <= 0))
then begin
debug_print "MetadataQuery: large sig, falling back to old method";
let no_hyp = MetadataDb.count_distinct `Hypothesis metadata in
let no_full = MetadataDb.count_distinct `Statement metadata in
let is_dummy = function
- | `Obj(s, _) -> (String.sub s 0 10) <> "cic:/dummy"
+ | `Obj(s, _) -> (String.sub (UriManager.string_of_uri s) 0 10) <> "cic:/dummy"
| _ -> true
in
let rec look_for_dummy_main = function
| [] -> None
| `Obj(s,`MainConclusion (Some (MetadataTypes.Eq d)))::_
- when ((String.sub s 0 10) = "cic:/dummy") ->
+ when (String.sub (UriManager.string_of_uri s) 0 10 = "cic:/dummy") ->
+ let s = UriManager.string_of_uri s in
let len = String.length s in
let dummy_index = int_of_string (String.sub s 11 (len-11)) in
let dummy_type = List.nth types dummy_index in
let map inners row =
match row.(0), row.(1), row.(2) with
| Some source, Some inner, Some index ->
- source, List.mem (int_of_string index, inner) inners
+ source,
+ List.mem
+ (int_of_string index, (UriManager.uri_of_string inner)) inners
| _ -> "", false
in
let rec rank ranks (source, ok) =
in
let compare (_, x) (_, y) = compare x y in
let filter n (uri, rank) =
- if rank > 0 then Some uri else None
+ if rank > 0 then Some (UriManager.uri_of_string uri) else None
in
match get_metadata t with
| None -> []
| Some (outer, inners) ->
let select = "source, h_inner, h_index" in
let from = "genLemma" in
- let where = Printf.sprintf "h_outer = \"%s\"" (Mysql.escape outer) in
+ let where =
+ Printf.sprintf "h_outer = \"%s\""
+ (Mysql.escape (UriManager.string_of_uri outer)) in
let query = Printf.sprintf "SELECT %s FROM %s WHERE %s" select from where in
let result = Mysql.exec dbd query in
let lemmas = Mysql.map result ~f:(map inners) in
projects / helm.git / blobdiff