X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_disambiguation%2FdisambiguateTypes.ml;h=92ca39f72571a9732867b51c098be7c2fc487c36;hb=5a9b1f46a8e866382a71d686e689e9e5907f1824;hp=522a08dc0adf4140ae77f6a5826f0bcb1df34b87;hpb=8004125685a99b6c0f2f95fd7f3fa09a4f5c9094;p=helm.git diff --git a/helm/ocaml/cic_disambiguation/disambiguateTypes.ml b/helm/ocaml/cic_disambiguation/disambiguateTypes.ml index 522a08dc0..92ca39f72 100644 --- a/helm/ocaml/cic_disambiguation/disambiguateTypes.ml +++ b/helm/ocaml/cic_disambiguation/disambiguateTypes.ml @@ -10,7 +10,7 @@ module OrderedDomain = let compare = Pervasives.compare end -module Domain = Set.Make (OrderedDomain) +(* module Domain = Set.Make (OrderedDomain) *) module Environment = Map.Make (OrderedDomain) type codomain_item = @@ -22,7 +22,6 @@ and environment = codomain_item Environment.t module type Callbacks = sig - val output_html : ?append_NL:bool -> Ui_logger.html_msg -> unit val interactive_user_uri_choice : selection_mode:[`SINGLE | `MULTIPLE] -> ?ok:string -> @@ -38,54 +37,14 @@ let string_of_domain_item = function | Symbol (s, i) -> Printf.sprintf "SYMBOL(%s,%d)" s i | Num i -> Printf.sprintf "NUM(instance %d)" i +let string_of_domain dom = + String.concat "; " (List.map string_of_domain_item dom) +(* let string_of_domain dom = let buf = Buffer.create 1024 in Domain.iter (fun item -> Buffer.add_string buf (string_of_domain_item item ^ "; ")) dom; Buffer.contents buf - -module EnvironmentP3 = - struct - type t = environment - let empty = "" - - let to_string env = - Environment.fold - (fun i v s -> - match i with - | Id id ->s ^ Printf.sprintf "alias %s %s\n" id (fst v) - | _ -> "") - env "" - - let of_string inputtext = - let regexpr = - let alfa = "[a-zA-Z_-]" in - let digit = "[0-9]" in - let ident = alfa ^ "\(" ^ alfa ^ "\|" ^ digit ^ "\)*" in - let blanks = "\( \|\t\|\n\)+" in - let nonblanks = "[^ \t\n]+" in - let uri = "/\(" ^ ident ^ "/\)*" ^ nonblanks in (* not very strict check *) - Str.regexp - ("alias" ^ blanks ^ "\(" ^ ident ^ "\)" ^ blanks ^ "\(" ^ uri ^ "\)") - in - let rec aux n = - try - let n' = Str.search_forward regexpr inputtext n in - let id = Id (Str.matched_group 2 inputtext) in - let uri = "cic:" ^ (Str.matched_group 5 inputtext) in - let resolve_id = aux (n' + 1) in - if Environment.mem id resolve_id then - resolve_id - else - let term = - HelmLibraryObjects.term_of_uri (UriManager.uri_of_string uri) - in - (Environment.add id (uri, (fun _ _ _ -> term)) - resolve_id) - with - Not_found -> Environment.empty - in - aux 0 - end +*)