X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fcomponents%2Fng_disambiguation%2FdisambiguateChoices.ml;h=071f1e00ea0bd1d3e59b1f2d3658675bd7cb1b9f;hb=729e08f5fb86b3ffee460fda4577b024ab5888aa;hp=3da5f9baa54d1756dec10e8d0ad87d659c582fe0;hpb=5553ac7623425bce6f34eed6e17d4f0f8163e9aa;p=helm.git diff --git a/matita/components/ng_disambiguation/disambiguateChoices.ml b/matita/components/ng_disambiguation/disambiguateChoices.ml index 3da5f9baa..071f1e00e 100644 --- a/matita/components/ng_disambiguation/disambiguateChoices.ml +++ b/matita/components/ng_disambiguation/disambiguateChoices.ml @@ -31,21 +31,12 @@ open DisambiguateTypes exception Choice_not_found of string Lazy.t -let num_choices = ref [] let nnum_choices = ref [] -let add_num_choice choice = num_choices := choice :: !num_choices let nadd_num_choice choice = nnum_choices := choice :: !nnum_choices let has_description dsc = (fun x -> fst x = dsc) -let lookup_num_choices () = !num_choices - -let lookup_num_by_dsc dsc = - try - List.find (has_description dsc) !num_choices - with Not_found -> raise (Choice_not_found (lazy ("Num with dsc " ^ dsc))) - let nlookup_num_by_dsc dsc = try List.find (has_description dsc) !nnum_choices @@ -57,7 +48,7 @@ let mk_choice ~mk_appl ~mk_implicit ~term_of_uri ~term_of_nref (dsc, args, appl (fun cic_args -> let env',rest = let names = - List.map (function CicNotationPt.IdentArg (_, name) -> name) args + List.map (function NotationPt.IdentArg (_, name) -> name) args in let rec combine_with_rest l1 l2 = match l1,l2 with @@ -88,11 +79,3 @@ let lookup_symbol_by_dsc ~mk_appl ~mk_implicit ~term_of_uri ~term_of_nref symbol (List.find (fun (dsc', _, _) -> dsc = dsc') interpretations) with Interpretations.Interpretation_not_found | Not_found -> raise (Choice_not_found (lazy (sprintf "Symbol %s, dsc %s" symbol dsc))) - -let cic_lookup_symbol_by_dsc = lookup_symbol_by_dsc - ~mk_implicit:(function - | true -> Cic.Implicit (Some `Type) - | false -> Cic.Implicit None) - ~mk_appl:(function (Cic.Appl l)::tl -> Cic.Appl (l@tl) | l -> Cic.Appl l) - ~term_of_uri:CicUtil.term_of_uri ~term_of_nref:(fun _ -> assert false) -;;