X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Ftactics%2FtacticChaser.ml;h=2d1b0dcfd14833a5cebde6d5598b9046bfe7c6b6;hb=4cb4d286a1fdcb150c2848a9d21ac3486906c317;hp=2235670a06e7a2814c8a4bfbba979cca5381ded8;hpb=584455a9f581cd2f0fa76a6720c5749b083db8bf;p=helm.git diff --git a/helm/ocaml/tactics/tacticChaser.ml b/helm/ocaml/tactics/tacticChaser.ml index 2235670a0..2d1b0dcfd 100644 --- a/helm/ocaml/tactics/tacticChaser.ml +++ b/helm/ocaml/tactics/tacticChaser.ml @@ -238,21 +238,24 @@ let searchTheorems mqi_handle (proof,goal) = (* prerr_endline "PRIMA DELLA PRIMA TYPE OF " ; *) - let ty_sort1 = CicTypeChecker.type_of_aux' metasenv ey1 ty1 in + let ty_sort1,u = (*TASSI: FIXME *) + CicTypeChecker.type_of_aux' metasenv ey1 ty1 CicUniv.empty_ugraph 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 + let ty_sort2,u1 = CicTypeChecker.type_of_aux' metasenv ey2 ty2 u 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 - let prop2 = if CicReduction.are_convertible - ey2 (Cic.Sort Cic.Prop) ty_sort2 then 0 - else 1 in - prop1 - prop2 in - List.map (fun (level,(proof,goallist)) -> (proof, (List.stable_sort (order_goal_list proof) goallist))) res + let b,u2 = + CicReduction.are_convertible ey1 (Cic.Sort Cic.Prop) ty_sort1 u1 in + let prop1 = if b then 0 else 1 in + let b,_ = CicReduction.are_convertible ey2 (Cic.Sort Cic.Prop) ty_sort2 u2 in + let prop2 = if b then 0 else 1 in + prop1 - prop2 in + List.map ( + fun (level,(proof,goallist)) -> + (proof, (List.stable_sort (order_goal_list proof) goallist)) + ) res ;;