X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=components%2Fgrafite_parser%2FgrafiteDisambiguator.ml;h=4f812ff2f032abae8448782165da6bdc544d5bea;hb=b3fe1b05014341773ab30cf14fdffa8a7e2f298c;hp=76d44421c62452edb280d6e0bad8b7e9f7c2f496;hpb=a0d4ddbd29ac0a26e462125ae9e7e0a177dbde18;p=helm.git diff --git a/components/grafite_parser/grafiteDisambiguator.ml b/components/grafite_parser/grafiteDisambiguator.ml index 76d44421c..4f812ff2f 100644 --- a/components/grafite_parser/grafiteDisambiguator.ml +++ b/components/grafite_parser/grafiteDisambiguator.ml @@ -30,7 +30,10 @@ open Printf exception Ambiguous_input (* the integer is an offset to be added to each location *) exception DisambiguationError of - int * (Token.flocation option * string Lazy.t) list list + int * + ((Token.flocation list * string * string) list * + (DisambiguateTypes.domain_item * DisambiguateTypes.codomain_item) list * + Token.flocation option * string Lazy.t * bool) list list (** parameters are: option name, error message *) exception Unbound_identifier of string @@ -108,8 +111,8 @@ let disambiguate_thing ~aliases ~universe f ~fresh_instances ~aliases ~universe thing in let set_aliases (instances,(use_mono_aliases,_,_),_) (_, user_asked as res) = - if use_mono_aliases && not instances then - drop_aliases res + if use_mono_aliases then + drop_aliases ~minimize_instances:true res (* one shot aliases *) else if user_asked then drop_aliases ~minimize_instances:true res (* one shot aliases *) else