X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite_parser%2FgrafiteDisambiguate.ml;h=9f63a5d8f6bd52a8a1d979d84d8ea957b47f6a93;hb=79a489c46c77de80979d68a512d1f640f8273f9e;hp=fbbbf6e02c450e86e335459449423e6682166918;hpb=6d80ab08869042fc89f54ab781a27045023acd6f;p=helm.git diff --git a/helm/software/components/grafite_parser/grafiteDisambiguate.ml b/helm/software/components/grafite_parser/grafiteDisambiguate.ml index fbbbf6e02..9f63a5d8f 100644 --- a/helm/software/components/grafite_parser/grafiteDisambiguate.ml +++ b/helm/software/components/grafite_parser/grafiteDisambiguate.ml @@ -41,7 +41,7 @@ let singleton msg = function | l, _ -> let debug = Printf.sprintf "GrafiteDisambiguate.singleton (%s): %u interpretations" - msg (List.length l) + msg (List.length l) in HLog.debug debug; assert false @@ -343,7 +343,7 @@ let rec disambiguate_tactic metasenv,GrafiteAst.AutoBatch (loc,params) | GrafiteAst.Cases (loc, what, pattern, idents) -> let metasenv,what = disambiguate_term context metasenv what in - let pattern = disambiguate_pattern pattern in + let pattern = disambiguate_pattern pattern in metasenv,GrafiteAst.Cases (loc, what, pattern, idents) | GrafiteAst.Change (loc, pattern, with_what) -> let with_what = disambiguate_lazy_term with_what in @@ -381,20 +381,20 @@ let rec disambiguate_tactic metasenv, term :: terms in let metasenv, terms = List.fold_right map terms (metasenv, []) in - metasenv, GrafiteAst.Destruct(loc, Some terms) + metasenv, GrafiteAst.Destruct(loc, Some terms) | GrafiteAst.Destruct (loc, None) -> metasenv,GrafiteAst.Destruct(loc,None) | GrafiteAst.Exact (loc, term) -> let metasenv,cic = disambiguate_term context metasenv term in metasenv,GrafiteAst.Exact (loc, cic) | GrafiteAst.Elim (loc, what, Some using, pattern, specs) -> - let metasenv,what = disambiguate_term context metasenv what in + let metasenv,what = disambiguate_term context metasenv what in let metasenv,using = disambiguate_term context metasenv using in - let pattern = disambiguate_pattern pattern in + let pattern = disambiguate_pattern pattern in metasenv,GrafiteAst.Elim (loc, what, Some using, pattern, specs) | GrafiteAst.Elim (loc, what, None, pattern, specs) -> - let metasenv,what = disambiguate_term context metasenv what in - let pattern = disambiguate_pattern pattern in + let metasenv,what = disambiguate_term context metasenv what in + let pattern = disambiguate_pattern pattern in metasenv,GrafiteAst.Elim (loc, what, None, pattern, specs) | GrafiteAst.ElimType (loc, what, Some using, specs) -> let metasenv,what = disambiguate_term context metasenv what in @@ -470,94 +470,94 @@ let rec disambiguate_tactic metasenv,GrafiteAst.Assume (loc, id, cic) | GrafiteAst.Suppose (loc, term, id, term') -> let metasenv,cic = disambiguate_term context metasenv term in - let metasenv,cic' = - match term' with - None -> metasenv,None - | Some t -> - let metasenv,t = disambiguate_term context metasenv t in - metasenv,Some t in - metasenv,GrafiteAst.Suppose (loc, cic, id, cic') + let metasenv,cic' = + match term' with + None -> metasenv,None + | Some t -> + let metasenv,t = disambiguate_term context metasenv t in + metasenv,Some t in + metasenv,GrafiteAst.Suppose (loc, cic, id, cic') | GrafiteAst.Bydone (loc,just) -> let metasenv,just = disambiguate_just disambiguate_term context metasenv just in - metasenv,GrafiteAst.Bydone (loc, just) + metasenv,GrafiteAst.Bydone (loc, just) | GrafiteAst.We_need_to_prove (loc,term,id,term') -> let metasenv,cic = disambiguate_term context metasenv term in - let metasenv,cic' = - match term' with - None -> metasenv,None - | Some t -> - let metasenv,t = disambiguate_term context metasenv t in - metasenv,Some t in - metasenv,GrafiteAst.We_need_to_prove (loc,cic,id,cic') + let metasenv,cic' = + match term' with + None -> metasenv,None + | Some t -> + let metasenv,t = disambiguate_term context metasenv t in + metasenv,Some t in + metasenv,GrafiteAst.We_need_to_prove (loc,cic,id,cic') | GrafiteAst.By_just_we_proved (loc,just,term',id,term'') -> let metasenv,just = disambiguate_just disambiguate_term context metasenv just in let metasenv,cic' = disambiguate_term context metasenv term' in - let metasenv,cic'' = - match term'' with - None -> metasenv,None - | Some t -> - let metasenv,t = disambiguate_term context metasenv t in - metasenv,Some t in - metasenv,GrafiteAst.By_just_we_proved (loc,just,cic',id,cic'') + let metasenv,cic'' = + match term'' with + None -> metasenv,None + | Some t -> + let metasenv,t = disambiguate_term context metasenv t in + metasenv,Some t in + metasenv,GrafiteAst.By_just_we_proved (loc,just,cic',id,cic'') | GrafiteAst.We_proceed_by_cases_on (loc, term, term') -> let metasenv,cic = disambiguate_term context metasenv term in - let metasenv,cic' = disambiguate_term context metasenv term' in - metasenv,GrafiteAst.We_proceed_by_cases_on (loc, cic, cic') + let metasenv,cic' = disambiguate_term context metasenv term' in + metasenv,GrafiteAst.We_proceed_by_cases_on (loc, cic, cic') | GrafiteAst.We_proceed_by_induction_on (loc, term, term') -> let metasenv,cic = disambiguate_term context metasenv term in - let metasenv,cic' = disambiguate_term context metasenv term' in - metasenv,GrafiteAst.We_proceed_by_induction_on (loc, cic, cic') + let metasenv,cic' = disambiguate_term context metasenv term' in + metasenv,GrafiteAst.We_proceed_by_induction_on (loc, cic, cic') | GrafiteAst.Byinduction (loc, term, id) -> let metasenv,cic = disambiguate_term context metasenv term in - metasenv,GrafiteAst.Byinduction(loc, cic, id) + metasenv,GrafiteAst.Byinduction(loc, cic, id) | GrafiteAst.Thesisbecomes (loc, term) -> let metasenv,cic = disambiguate_term context metasenv term in - metasenv,GrafiteAst.Thesisbecomes (loc, cic) + metasenv,GrafiteAst.Thesisbecomes (loc, cic) | GrafiteAst.ExistsElim (loc, just, id1, term1, id2, term2) -> - let metasenv,just = + let metasenv,just = disambiguate_just disambiguate_term context metasenv just in let metasenv,cic' = disambiguate_term context metasenv term1 in - let cic''= disambiguate_lazy_term term2 in - metasenv,GrafiteAst.ExistsElim(loc, just, id1, cic', id2, cic'') + let cic''= disambiguate_lazy_term term2 in + metasenv,GrafiteAst.ExistsElim(loc, just, id1, cic', id2, cic'') | GrafiteAst.AndElim (loc, just, id, term1, id1, term2) -> - let metasenv,just = + let metasenv,just = disambiguate_just disambiguate_term context metasenv just in - let metasenv,cic'= disambiguate_term context metasenv term1 in - let metasenv,cic''= disambiguate_term context metasenv term2 in - metasenv,GrafiteAst.AndElim(loc, just, id, cic', id1, cic'') + let metasenv,cic'= disambiguate_term context metasenv term1 in + let metasenv,cic''= disambiguate_term context metasenv term2 in + metasenv,GrafiteAst.AndElim(loc, just, id, cic', id1, cic'') | GrafiteAst.Case (loc, id, params) -> let metasenv,params' = - List.fold_right - (fun (id,term) (metasenv,params) -> + List.fold_right + (fun (id,term) (metasenv,params) -> let metasenv,cic = disambiguate_term context metasenv term in - metasenv,(id,cic)::params - ) params (metasenv,[]) - in - metasenv,GrafiteAst.Case(loc, id, params') + metasenv,(id,cic)::params + ) params (metasenv,[]) + in + metasenv,GrafiteAst.Case(loc, id, params') | GrafiteAst.RewritingStep (loc, term1, term2, term3, cont) -> let metasenv,cic = - match term1 with - None -> metasenv,None - | Some (start,t) -> - let metasenv,t = disambiguate_term context metasenv t in - metasenv,Some (start,t) in - let metasenv,cic'= disambiguate_term context metasenv term2 in + match term1 with + None -> metasenv,None + | Some (start,t) -> + let metasenv,t = disambiguate_term context metasenv t in + metasenv,Some (start,t) in + let metasenv,cic'= disambiguate_term context metasenv term2 in let metasenv,cic'' = - match term3 with + match term3 with | `SolveWith term -> - let metasenv,term = disambiguate_term context metasenv term in + let metasenv,term = disambiguate_term context metasenv term in metasenv, `SolveWith term - | `Auto params -> + | `Auto params -> let metasenv, params = disambiguate_auto_params metasenv params in metasenv,`Auto params - | `Term t -> - let metasenv,t = disambiguate_term context metasenv t in - metasenv,`Term t + | `Term t -> + let metasenv,t = disambiguate_term context metasenv t in + metasenv,`Term t | `Proof as t -> metasenv,t in - metasenv,GrafiteAst.RewritingStep (loc, cic, cic', cic'', cont) + metasenv,GrafiteAst.RewritingStep (loc, cic, cic', cic'', cont) let disambiguate_obj lexicon_status ?baseuri metasenv (text,prefix_len,obj) = let uri = @@ -570,11 +570,59 @@ let disambiguate_obj lexicon_status ?baseuri metasenv (text,prefix_len,obj) = | None -> raise BaseUriNotSetYet) | CicNotationPt.Inductive _ -> assert false | CicNotationPt.Theorem _ -> None in - (* - (let time = Unix.gettimeofday () in - prerr_endline "INIZIO NUOVA DISAMBIGUAZIONE"; + let try_new cic = + (NCicLibrary.clear_cache (); + NCicEnvironment.invalidate (); + OCic2NCic.clear (); (match obj with CicNotationPt.Theorem (_,_,ty,_) -> + let graph = + match cic with + | Cic.CurrentProof (_,metasenv, _, ty,_,_) -> + let _, ugraph = + CicTypeChecker.type_of_aux' metasenv [] ty CicUniv.empty_ugraph + in + ugraph + | Cic.Constant (_,_, ty,_,_) -> + let _, ugraph = + CicTypeChecker.type_of_aux' [] [] ty CicUniv.empty_ugraph + in + ugraph + | _ -> CicUniv.empty_ugraph + in + +(* + prerr_endline "PRIMA COERCIONS"; + let _,l = CicUniv.do_rank graph in + List.iter (fun k -> + prerr_endline (CicUniv.string_of_universe k ^ " = " ^ string_of_int + (CicUniv.get_rank k))) l; +*) + + let graph = + List.fold_left + (fun graph (_,_,l) -> + List.fold_left + (fun graph (uri,_,_) -> + let _,g = CicTypeChecker.typecheck uri in + CicUniv.merge_ugraphs ~base_ugraph:graph ~increment:(g,uri)) + graph l) + graph (CoercDb.to_list ()) + in + ignore(CicUniv.do_rank graph); + + +(* + prerr_endline "DOPO COERCIONS"; + let _,l = CicUniv.do_rank graph in + List.iter (fun k -> + prerr_endline (CicUniv.string_of_universe k ^ " = " ^ string_of_int + (CicUniv.get_rank k))) l; +*) + + + prerr_endline "INIZIO NUOVA DISAMBIGUAZIONE"; + let time = Unix.gettimeofday () in (try (match NCicDisambiguate.disambiguate_term @@ -582,9 +630,10 @@ let disambiguate_obj lexicon_status ?baseuri metasenv (text,prefix_len,obj) = ~description_of_alias:LexiconAst.description_of_alias ~mk_choice:ncic_mk_choice ~mk_implicit + ~coercion_db:(NCicCoercion.db ()) ~context:[] ~metasenv:[] ~subst:[] - ~aliases:lexicon_status.LexiconEngine.aliases - ~universe:(Some lexicon_status.LexiconEngine.multi_aliases) + ~aliases:lexicon_status.LexiconEngine.aliases + ~universe:(Some lexicon_status.LexiconEngine.multi_aliases) (text,prefix_len,ty) with | [_,metasenv,subst,ty],_ -> @@ -601,9 +650,16 @@ let disambiguate_obj lexicon_status ?baseuri metasenv (text,prefix_len,obj) = (* | exn -> prerr_endline (Printexc.to_string exn) *) ) | _ -> ()) - ); - let time = Unix.gettimeofday () in - *) + ) + in + + +(* + try + let time = Unix.gettimeofday () in +*) + + let (diff, metasenv, _, cic, _) = singleton "third" (CicDisambiguate.disambiguate_obj @@ -614,34 +670,64 @@ let disambiguate_obj lexicon_status ?baseuri metasenv (text,prefix_len,obj) = ~aliases:lexicon_status.LexiconEngine.aliases ~universe:(Some lexicon_status.LexiconEngine.multi_aliases) ~uri (text,prefix_len,obj)) in + + (* let time = Unix.gettimeofday () -. time in prerr_endline ("VECCHIA DISAMBIGUAZIONE: " ^ string_of_float time); + try_new cic; *) + + + let lexicon_status = LexiconEngine.set_proof_aliases lexicon_status diff in lexicon_status, metasenv, cic + + +(* + with + | Sys.Break as exn -> raise exn + | exn -> + try_new (Cic.InductiveDefinition ([],[],0,[])); + raise exn +*) + + +;; let disambiguate_command lexicon_status ?baseuri metasenv (text,prefix_len,cmd)= match cmd with | GrafiteAst.Index(loc,key,uri) -> let lexicon_status_ref = ref lexicon_status in let disambiguate_term = - disambiguate_term None text prefix_len lexicon_status_ref [] in + disambiguate_term None text prefix_len lexicon_status_ref [] in let disambiguate_term_option metasenv = - function + function None -> metasenv,None - | Some t -> + | Some t -> let metasenv,t = disambiguate_term metasenv t in - metasenv, Some t + metasenv, Some t in let metasenv,key = disambiguate_term_option metasenv key in !lexicon_status_ref, metasenv,GrafiteAst.Index(loc,key,uri) + | GrafiteAst.PreferCoercion (loc,t) -> + let lexicon_status_ref = ref lexicon_status in + let disambiguate_term = + disambiguate_term None text prefix_len lexicon_status_ref [] in + let metasenv,t = disambiguate_term metasenv t in + !lexicon_status_ref, metasenv, GrafiteAst.PreferCoercion (loc,t) | GrafiteAst.Coercion (loc,t,b,a,s) -> let lexicon_status_ref = ref lexicon_status in let disambiguate_term = - disambiguate_term None text prefix_len lexicon_status_ref [] in + disambiguate_term None text prefix_len lexicon_status_ref [] in let metasenv,t = disambiguate_term metasenv t in !lexicon_status_ref, metasenv, GrafiteAst.Coercion (loc,t,b,a,s) + | GrafiteAst.UnificationHint (loc, t) -> + let lexicon_status_ref = ref lexicon_status in + let disambiguate_term = + disambiguate_term None text prefix_len lexicon_status_ref [] in + let metasenv,t = disambiguate_term metasenv t in + !lexicon_status_ref, metasenv, GrafiteAst.UnificationHint (loc,t) | GrafiteAst.Default _ | GrafiteAst.Drop _ | GrafiteAst.Include _