X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FgTopLevel%2FoldDisambiguate.ml;h=82d0f36f5ddc519b029ba4b6e46f5ff5b76c2eda;hb=c5d5bf37b1e4c4b9b499ed2cbfe27cf2ec181944;hp=39be585e55e3082dd4256fd7207f9ffb6c12f6ec;hpb=fe1e7e151af9690f312259a4c1c969a1388bee5f;p=helm.git diff --git a/helm/gTopLevel/oldDisambiguate.ml b/helm/gTopLevel/oldDisambiguate.ml index 39be585e5..82d0f36f5 100644 --- a/helm/gTopLevel/oldDisambiguate.ml +++ b/helm/gTopLevel/oldDisambiguate.ml @@ -46,7 +46,7 @@ module type Callbacks = ?enable_button_for_non_vars:bool -> title:string -> msg:string -> id:string -> string list -> string list val interactive_interpretation_choice : - (string * string) list list -> int + (string * string) list list -> int list val input_or_locate_uri : title:string -> UriManager.uri end ;; @@ -168,7 +168,7 @@ module Make(C:Callbacks) = CicRefine.Uncertain _ -> prerr_endline ("%%% UNCERTAIN!!! " ^ CicPp.ppterm expr) ; Uncertain - | _ -> + | CicRefine.RefineFailure _ -> prerr_endline ("%%% PRUNED!!! " ^ CicPp.ppterm expr) ; Ko in @@ -232,10 +232,10 @@ prerr_endline ("%%% PRUNED!!! " ^ CicPp.ppterm expr) ; exit 1 end ) resolve_ids ; - let resolve_id',term,metasenv' = + let res = match resolve_ids with [] -> raise ThereDoesNotExistAnyWellTypedInterpretationOfTheInput - | [resolve_id] -> resolve_id + | [_] -> resolve_ids | _ -> let choices = List.map @@ -266,10 +266,13 @@ prerr_endline ("%%% PRUNED!!! " ^ CicPp.ppterm expr) ; ) dom ) resolve_ids in - let index = C.interactive_interpretation_choice choices in - List.nth resolve_ids index + let indexes = C.interactive_interpretation_choice choices in + List.map (List.nth resolve_ids) indexes in - (known_ids @ dom', resolve_id'), metasenv',term + List.map + (fun (resolve_id',term,metasenv') -> + (known_ids @ dom', resolve_id'), metasenv',term + ) res end ;;