From 398cabf645bbd86c527ddfff2bffe59b2d5e8fcb Mon Sep 17 00:00:00 2001 From: Andrea Asperti Date: Mon, 28 Jun 2004 11:02:02 +0000 Subject: [PATCH] fixed typo --- helm/ocaml/tactics/tacticChaser.ml | 32 ++++++++++++++++++------------ 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/helm/ocaml/tactics/tacticChaser.ml b/helm/ocaml/tactics/tacticChaser.ml index b0148224c..e4e20f640 100644 --- a/helm/ocaml/tactics/tacticChaser.ml +++ b/helm/ocaml/tactics/tacticChaser.ml @@ -146,7 +146,7 @@ let matchConclusion2 mqi_handle ?(output_html = (fun _ -> ())) ~choose_must() st (* concl_cost are the costants in the conclusion of the proof while hyp_const are the constants in the hypothesis *) let concl_const = NewConstraints.constants_concl ty in - prerr_endline ("Ne sono rimasti " ^ string_of_int (List.length uris)); + prerr_endline ("Ne sono rimasti 1 " ^ string_of_int (List.length uris)); let hyp t set = match t with Some (_,Cic.Decl t) -> (NewConstraints.StringSet.union set (NewConstraints.constants_concl t)) @@ -159,7 +159,8 @@ let matchConclusion2 mqi_handle ?(output_html = (fun _ -> ())) ~choose_must() st let all_const = NewConstraints.StringSet.union hyp_const concl_const in let uris = if (List.length uris < (Filter_auto.power 2 (List.length (NewConstraints.StringSet.elements all_const)))) - then List.filter (Filter_auto.filter_new_constants conn all_const) uris + then + (prerr_endline("metodo vecchio");List.filter (Filter_auto.filter_new_constants conn all_const) uris) else Filter_auto.filter_uris conn all_const uris in (* let uris = @@ -177,20 +178,20 @@ let matchConclusion2 mqi_handle ?(output_html = (fun _ -> ())) ~choose_must() st | (m,uri)::tl -> let tl' = filter_out tl in try + prerr_endline ("STO APPLICANDO " ^ uri); (m, - (prerr_endline ("STO APPLICANDO " ^ uri); (ProofEngineTypes.apply_tactic( PrimitiveTactics.apply_tac ~term:(MQueryMisc.term_of_cic_textual_parser_uri (MQueryMisc.cic_textual_parser_uri_of_string uri))) - status)))::tl' + status))::tl' (* with ProofEngineTypes.Fail _ -> tl' *) (* patch to cover CSC's exportation bug *) with _ -> tl' in - prerr_endline ("Ne sono rimasti " ^ string_of_int (List.length uris)); + prerr_endline ("Ne sono rimasti 2 " ^ string_of_int (List.length uris)); filter_out uris in - prerr_endline ("Ne sono rimasti " ^ string_of_int (List.length uris')); + prerr_endline ("Ne sono rimasti 3 " ^ string_of_int (List.length uris')); uris' ;; @@ -233,14 +234,19 @@ let searchTheorems mqi_handle (proof,goal) = List.map snd res in*) let order_goal_list proof goal1 goal2 = let _,metasenv,_,_ = proof in - let (ey1, ty1) = - let (_, ey ,ty) = CicUtil.lookup_meta goal1 metasenv in - (ey, ty) in - let (ey2, ty2) = - let (_, ey ,ty) = CicUtil.lookup_meta goal2 metasenv in - (ey, ty) in + let (_, ey1, ty1) = CicUtil.lookup_meta goal1 metasenv in + let (_, ey2, ty2) = CicUtil.lookup_meta goal2 metasenv in +(* + prerr_endline "PRIMA DELLA PRIMA TYPE OF " ; +*) let ty_sort1 = CicTypeChecker.type_of_aux' metasenv ey1 ty1 in - let ty_sort2 = CicTypeChecker.type_of_aux' metasenv ey1 ty2 in +(* + prerr_endline (Printf.sprintf "PRIMA DELLA SECONDA TYPE OF %s \n### %s @@@%s " (CicMetaSubst.ppmetasenv metasenv []) (CicMetaSubst.ppcontext [] ey2) (CicMetaSubst.ppterm [] ty2)); +*) + let ty_sort2 = CicTypeChecker.type_of_aux' metasenv ey2 ty2 in +(* + prerr_endline "DOPO LA SECONDA TYPE OF " ; +*) let prop1 = if CicReduction.are_convertible ey1 (Cic.Sort Cic.Prop) ty_sort1 then 0 else 1 in -- 2.39.2