X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_disambiguation%2Fdisambiguate.mli;h=fc88b6cf84d54320fb092cb9a3f67763a1585897;hb=afa05d30f20de12e031c3e5c3e5c33c19c42a7d8;hp=5b0e0da1e24fc0e380dbb395bffce7f73cde1efb;hpb=8b55faddb06e3c4b0a13839210bb49170939b33e;p=helm.git diff --git a/helm/ocaml/cic_disambiguation/disambiguate.mli b/helm/ocaml/cic_disambiguation/disambiguate.mli index 5b0e0da1e..fc88b6cf8 100644 --- a/helm/ocaml/cic_disambiguation/disambiguate.mli +++ b/helm/ocaml/cic_disambiguation/disambiguate.mli @@ -25,11 +25,12 @@ (** {2 Disambiguation interface} *) -exception NoWellTypedInterpretation +exception NoWellTypedInterpretation of + (Token.flocation option * string Lazy.t) list exception PathNotWellFormed val interpretate_path : - context:Cic.name list -> DisambiguateTypes.term -> + context:Cic.name list -> CicNotationPt.term -> Cic.term module type Disambiguator = @@ -45,7 +46,7 @@ sig ?initial_ugraph:CicUniv.universe_graph -> aliases:DisambiguateTypes.environment ->(* previous interpretation status *) universe:DisambiguateTypes.multiple_environment option -> - DisambiguateTypes.term -> + CicNotationPt.term -> ((DisambiguateTypes.domain_item * DisambiguateTypes.codomain_item) list * Cic.metasenv * (* new metasenv *) Cic.term * @@ -59,7 +60,7 @@ sig aliases:DisambiguateTypes.environment ->(* previous interpretation status *) universe:DisambiguateTypes.multiple_environment option -> uri:UriManager.uri option -> (* required only for inductive types *) - GrafiteAst.obj -> + CicNotationPt.obj -> ((DisambiguateTypes.domain_item * DisambiguateTypes.codomain_item) list * Cic.metasenv * (* new metasenv *) Cic.obj * @@ -69,23 +70,3 @@ end module Make (C : DisambiguateTypes.Callbacks) : Disambiguator -module Trivial: -sig - exception Ambiguous_term of string Lazy.t - - (** disambiguate an _unanmbiguous_ term using dummy callbacks which fail if a - * choice from the user is needed to disambiguate the term - * @raise Ambiguous_term for ambiguous term *) - val disambiguate_string: - dbd:HMysql.dbd -> - ?context:Cic.context -> - ?metasenv:Cic.metasenv -> - ?initial_ugraph:CicUniv.universe_graph -> - ?aliases:DisambiguateTypes.environment ->(* previous interpretation status*) - string -> - ((DisambiguateTypes.domain_item * DisambiguateTypes.codomain_item) list * - Cic.metasenv * (* new metasenv *) - Cic.term * - CicUniv.universe_graph) list (* disambiguated term *) -end -