X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FgTopLevel%2FoldDisambiguate.ml;h=39be585e55e3082dd4256fd7207f9ffb6c12f6ec;hb=c9995e146dc70bed25b9fe2913f3d5d31a4f9086;hp=122409df907941fd9906b6438cec03bc1109c00c;hpb=a8c9f88c2c310e303dba976bf37b2eb755798268;p=helm.git diff --git a/helm/gTopLevel/oldDisambiguate.ml b/helm/gTopLevel/oldDisambiguate.ml index 122409df9..39be585e5 100644 --- a/helm/gTopLevel/oldDisambiguate.ml +++ b/helm/gTopLevel/oldDisambiguate.ml @@ -40,7 +40,6 @@ open Printf 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 -> @@ -68,12 +67,12 @@ module Make(C:Callbacks) = (function uri,_ -> MQueryMisc.wrong_xpointer_format_from_wrong_xpointer_format' uri ) result in - C.output_html (`Msg (`T "Locate query:")); + HelmLogger.log (`Msg (`T "Locate query:")); MQueryUtil.text_of_query - (fun s -> C.output_html ~append_NL:false (`Msg (`T s))) + (fun s -> HelmLogger.log ~append_NL:false (`Msg (`T s))) "" query; - C.output_html (`Msg (`T "Result:")); - MQueryUtil.text_of_result (fun s -> C.output_html (`Msg (`T s))) "" result; + HelmLogger.log (`Msg (`T "Result:")); + MQueryUtil.text_of_result (fun s -> HelmLogger.log (`Msg (`T s))) "" result; let uris' = match uris with [] -> @@ -140,7 +139,7 @@ module Make(C:Callbacks) = ) 1 list_of_uris in if tests_no > 1 then - C.output_html (`Msg (`T (sprintf + HelmLogger.log (`Msg (`T (sprintf "Disambiguation phase started: up to %d cases will be tried" tests_no))); (* and now we compute the list of all possible assignments from *) @@ -161,7 +160,7 @@ module Make(C:Callbacks) = let metasenv',expr = mk_metasenv_and_expr resolve_id' in (*CSC: Bug here: we do not try to typecheck also the metasenv' *) try - let term,_,_,metasenv'' = + let term,_,metasenv'' = CicRefine.type_of_aux' metasenv' context expr in Ok (term,metasenv'') @@ -227,8 +226,8 @@ prerr_endline ("%%% PRUNED!!! " ^ CicPp.ppterm expr) ; prerr_endline (Printf.sprintf "+++++ ASSERTION FAILED: a refine operation should not modify the metasenv. Old metasenv:\n %s\n New metasenv:\n %s\n" - (CicMetaSubst.ppmetasenv [] metasenv) - (CicMetaSubst.ppmetasenv [] newmetasenv)) ; + (CicMetaSubst.ppmetasenv metasenv []) + (CicMetaSubst.ppmetasenv newmetasenv [])) ; (* an assert would raise an exception that could be caught *) exit 1 end