X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaEngine.ml;h=2ac69a57502a31b0487f89b39caec8ac46921355;hb=358cefe50cccd4cb7d8e2a9cecb7efcb5780b8a3;hp=148f550fdcee8f3946d949f32e5bca86e605c193;hpb=53ee2f5095adadffcafb40e436d23dc330d3bd87;p=helm.git diff --git a/helm/matita/matitaEngine.ml b/helm/matita/matitaEngine.ml index 148f550fd..2ac69a575 100644 --- a/helm/matita/matitaEngine.ml +++ b/helm/matita/matitaEngine.ml @@ -214,19 +214,46 @@ let eval_coercion status coercion = in let new_coercions = (* also adds them to the Db *) - CoercGraph.close_coercion_graph src_uri tgt_uri coer_uri - in - let status = - List.fold_left ( - fun s (uri,o,ugraph) -> - match o with - | Cic.Constant (_,Some body, ty, params, attrs) -> - MatitaSync.add_constant ~uri ~body ~ty ~ugraph ~params ~attrs status - | _ -> assert false - ) status new_coercions - in + CoercGraph.close_coercion_graph src_uri tgt_uri coer_uri in + let status = + List.fold_left (fun s (uri,o,ugraph) -> MatitaSync.add_obj uri o status) + status new_coercions in {status with proof_status = No_proof} - + +let generate_elimination_principles uri status = + let elim sort status = + try + let uri,obj = CicElim.elim_of ~sort uri 0 in + MatitaSync.add_obj uri obj status + with CicElim.Can_t_eliminate -> status + in + List.fold_left (fun status sort -> elim sort status) status + [ Cic.Prop; Cic.Set; (Cic.Type (CicUniv.fresh ())) ] + +let generate_projections uri status = + let projections = CicRecord.projections_of uri in + List.fold_left + (fun status (uri, name, bo) -> + try + let ty, ugraph = + CicTypeChecker.type_of_aux' [] [] bo CicUniv.empty_ugraph in + let bo = Unshare.unshare bo in + let ty = Unshare.unshare ty in + let attrs = [`Class `Projection; `Generated] in + let obj = Cic.Constant (name,Some bo,ty,[],attrs) in + MatitaSync.add_obj uri obj status + with + CicTypeChecker.TypeCheckerFailure s -> + MatitaLog.message + ("Unable to create projection " ^ name ^ " cause: " ^ s); + status + | CicEnvironment.Object_not_found uri -> + let depend = UriManager.name_of_uri uri in + MatitaLog.message + ("Unable to create projection " ^ name ^ " because it requires " ^ depend); + status + ) status projections + let eval_command status cmd = match cmd with | TacticAst.Set (loc, name, value) -> set_option status name value @@ -244,83 +271,13 @@ let eval_command status cmd = let suri = UriManager.string_of_uri uri in if metasenv <> [] then command_error "Proof not completed! metasenv is not empty!"; - let proved_ty,ugraph = - CicTypeChecker.type_of_aux' [] [] bo CicUniv.empty_ugraph - in - let b,ugraph = - CicReduction.are_convertible [] proved_ty ty ugraph - in - if not b then - command_error - ("The type of your proof is not convertible with the "^ - "type you've declared!"); - MatitaLog.message (sprintf "%s defined" suri); - let status = MatitaSync.add_constant ~uri ~body:bo ~ty ~ugraph status in - {status with proof_status = No_proof } - | TacticAst.Record (loc, params, name, ty, fields) -> - let suri = MatitaMisc.qualify status name ^ ".ind" in - let record_spec = (suri, params, ty, fields) in - let status = MatitaSync.add_record_def record_spec status in - {status with proof_status = No_proof } - | TacticAst.Inductive (loc, dummy_params, types) -> - (* dummy_params are not real params, it is a list of nothing, and the only - * semantic content is the len, that is leftno (note: leftno and - * paramaters have nothing in common). - *) - let suri = - match types with - | (name, _, _, _) :: tl -> MatitaMisc.qualify status name ^ ".ind" - | _ -> assert false - in - let uri = UriManager.uri_of_string suri in - let leftno = List.length dummy_params in - let obj = Cic.InductiveDefinition (types, [], leftno, []) in - let ugraph = - CicTypeChecker.typecheck_mutual_inductive_defs uri - (types, [], leftno) CicUniv.empty_ugraph - in - let status = - MatitaSync.add_inductive_def ~uri ~types ~leftno ~ugraph status - in - {status with proof_status = No_proof } - | TacticAst.Theorem (loc, thm_flavour, Some name, ty, None) -> - let uri = - UriManager.uri_of_string (MatitaMisc.qualify status name ^ ".con") - in - let goalno = 1 in - let metasenv, body = - match status.proof_status with - | Intermediate metasenv -> - ((goalno, [], ty) :: metasenv) , Cic.Meta (goalno,[]) - | _-> assert false - in - let initial_proof = (Some uri, metasenv, body, ty) in - { status with proof_status = Incomplete_proof (initial_proof,goalno)} - | TacticAst.Theorem (loc, thm_flavour, Some name, ty, Some body) -> - let uri = - UriManager.uri_of_string (MatitaMisc.qualify status name ^ ".con") - in - let metasenv = MatitaMisc.get_proof_metasenv status in - let (body_type, ugraph) = - CicTypeChecker.type_of_aux' metasenv [] body CicUniv.empty_ugraph - in - let (subst, metasenv, ugraph) = - CicUnification.fo_unif metasenv [] body_type ty ugraph - in - if metasenv <> [] then - command_error ( - "metasenv not empty while giving a definition with body: " ^ - CicMetaSubst.ppmetasenv metasenv []) ; - let body = CicMetaSubst.apply_subst subst body in - let ty = CicMetaSubst.apply_subst subst ty in - let status = MatitaSync.add_constant ~uri ~body ~ty ~ugraph status in - {status with proof_status = No_proof} - | TacticAst.Theorem (_, _, None, _, _) -> - command_error "The grammar should avoid having unnamed theorems!" + let name = UriManager.name_of_uri uri in + let obj = Cic.Constant (name,Some bo,ty,[],[]) in + MatitaSync.add_obj uri obj status | TacticAst.Coercion (loc, coercion) -> eval_coercion status coercion | TacticAst.Alias (loc, spec) -> - match spec with + (match spec with | TacticAst.Ident_alias (id,uri) -> {status with aliases = DisambiguateTypes.Environment.add @@ -337,7 +294,43 @@ let eval_command status cmd = {status with aliases = DisambiguateTypes.Environment.add (DisambiguateTypes.Num instance) - (DisambiguateChoices.lookup_num_by_dsc desc) status.aliases } + (DisambiguateChoices.lookup_num_by_dsc desc) status.aliases }) + | TacticAst.Obj (loc,obj) -> + let ext,name = + match obj with + Cic.Constant (name,_,_,_,_) + | Cic.CurrentProof (name,_,_,_,_,_) -> ".con",name + | Cic.InductiveDefinition (types,_,_,_) -> + ".ind", + (match types with (name,_,_,_)::_ -> name | _ -> assert false) + | _ -> assert false in + let uri = + UriManager.uri_of_string (MatitaMisc.qualify status name ^ ext) + in + let metasenv = MatitaMisc.get_proof_metasenv status in + match obj with + Cic.CurrentProof (_,metasenv',bo,ty,_,_) -> + assert (metasenv = metasenv'); + let goalno = + match metasenv' with (goalno,_,_)::_ -> goalno | _ -> assert false in + let initial_proof = (Some uri, metasenv, bo, ty) in + { status with proof_status = Incomplete_proof (initial_proof,goalno)} + | _ -> + if metasenv <> [] then + command_error ( + "metasenv not empty while giving a definition with body: " ^ + CicMetaSubst.ppmetasenv metasenv []); + let status = MatitaSync.add_obj uri obj status in + match obj with + Cic.Constant _ -> status + | Cic.InductiveDefinition (_,_,_,attrs) + when List.mem (`Class `Record) attrs -> + let status = generate_elimination_principles uri status in + generate_projections uri status + | Cic.InductiveDefinition (_,_,_,_) -> + generate_elimination_principles uri status + | Cic.CurrentProof _ + | Cic.Variable _ -> assert false let eval_executable status ex = match ex with @@ -379,6 +372,36 @@ let disambiguate_term status term = in status, cic +let disambiguate_obj status obj = + let uri = + match obj with + TacticAst.Inductive (_,(name,_,_,_)::_) + | TacticAst.Record (_,name,_,_) -> + Some (UriManager.uri_of_string (MatitaMisc.qualify status name ^ ".ind")) + | TacticAst.Inductive _ -> assert false + | _ -> None in + let (aliases, metasenv, cic, _) = + match + MatitaDisambiguator.disambiguate_obj ~dbd:(MatitaDb.instance ()) + ~aliases:(status.aliases) ~uri obj + with + | [x] -> x + | _ -> assert false + in + let proof_status = + match status.proof_status with + | No_proof -> Intermediate metasenv + | Incomplete_proof _ + | Intermediate _ + | Proof _ -> assert false + in + let status = + { status with + aliases = aliases; + proof_status = proof_status } + in + status, cic + let disambiguate_closedtypes status terms = let term = CicAst.pack terms in let status, term = disambiguate_term status term in @@ -432,7 +455,7 @@ let disambiguate_tactic status = function let status, term = disambiguate_term status term in status, TacticAst.LetIn (loc,term,name) | TacticAst.ReduceAt (loc, reduction_kind, ident, path) -> - let path = Disambiguate.interpretate [] status.aliases path in + let path = Disambiguate.interpretate_path [] status.aliases path in status, TacticAst.ReduceAt(loc, reduction_kind, ident, path) | TacticAst.Reduce (loc, reduction_kind, opts) -> let status, opts = @@ -508,129 +531,16 @@ and disambiguate_tacticals status tacticals = let tacticals = List.rev tacticals in status, tacticals -let disambiguate_inddef status params indTypes = - let add_pi binders t = - List.fold_right - (fun (name, ast) acc -> - CicAst.Binder (`Forall, (Cic.Name name, Some ast), acc)) - binders t - in - let ind_binders = - List.map (fun (name, _, typ, _) -> (name, add_pi params typ)) indTypes - in - let binders = ind_binders @ params in - let asts = ref [] in - let add_ast ast = asts := ast :: !asts in - let paramsno = List.length params in - let indbindersno = List.length ind_binders in - List.iter - (fun (name, _, typ, constructors) -> - add_ast (add_pi params typ); - List.iter (fun (_, ast) -> add_ast (add_pi binders ast)) constructors) - indTypes; - let status, terms = disambiguate_closedtypes status !asts in - let terms = ref (List.rev terms) in - let get_term () = - match !terms with [] -> assert false | hd :: tl -> terms := tl; hd - in - let uri = - match indTypes with - | (name, _, _, _) :: _ -> MatitaMisc.qualify status name ^ ".ind" - | _ -> assert false - in - let mutinds = - let counter = ref 0 in - List.map - (fun _ -> - incr counter; - CicUtil.term_of_uri (sprintf "%s#xpointer(1/%d)" uri !counter)) - indTypes - in - let subst_mutinds = List.fold_right CicSubstitution.subst mutinds in - let cicIndTypes = - List.fold_left - (fun acc (name, inductive, typ, constructors) -> - let cicTyp = get_term () in - let cicConstructors = - List.fold_left - (fun acc (name, _) -> - let typ = - subst_mutinds (CicUtil.strip_prods indbindersno (get_term ())) - in - (name, typ) :: acc) - [] constructors - in - (name, inductive, cicTyp, List.rev cicConstructors) :: acc) - [] indTypes - in - let cicIndTypes = List.rev cicIndTypes in - status, (UriManager.uri_of_string uri, (cicIndTypes, [], paramsno)) - -let disambiguate_record status params ty fields = - let packed = - List.fold_right - (fun (name,ast) acc -> - CicAst.Binder (`Forall, (Cic.Name name, Some ast), acc)) - (params @ ["",ty] @ fields) (CicAst.Sort `Type) - in - debug_print (CicAstPp.pp_term packed); - let status, packed = disambiguate_term status packed in - let rec split t = function - | [] -> [],t - | (n,_)::tl -> - match t with - | Cic.Prod (_, src, tgt) -> - let l, t = split tgt tl in - (n, src) :: l, t - | _-> assert false - in - let params, t = split packed params in - let ty, t = - match t with - | Cic.Prod (_ , ty, t) -> ty, t - | _ -> assert false - in - let fields, _ = - split (let t,_,_ = CicMetaSubst.delift_rels [] [] 1 t in t) fields - in - params, ty, fields - let disambiguate_command status = function - | TacticAst.Record(loc, params,name,ty,fields) -> - let params, ty, fields = - disambiguate_record status params ty fields - in - status, TacticAst.Record(loc, params, name, ty, fields) - | TacticAst.Inductive (loc, params, types) -> - let (status, (uri, (ind_types, vars, paramsno))) = - disambiguate_inddef status params types - in - let rec mk_list = function - | 0 -> [] - | n -> ("", Cic.Rel ~-117) :: mk_list (n-1) - in - (* once we've built the cic inductive types we no longer need terms - corresponding to parameters, but we need the leftno, and we encode - it as the length of dummy_params - *) - let dummy_params = mk_list paramsno in - status, TacticAst.Inductive (loc, dummy_params, ind_types) - | TacticAst.Theorem (loc, thm_flavour, name, ty, body) -> - let status, ty = disambiguate_term status ty in - let status, body = - match body with - | None -> status, None - | Some body -> - let status, body = disambiguate_term status body in - status, Some body - in - status, TacticAst.Theorem (loc, thm_flavour, name, ty, body) | TacticAst.Coercion (loc, term) -> let status, term = disambiguate_term status term in status, TacticAst.Coercion (loc,term) | (TacticAst.Set _ | TacticAst.Qed _) as cmd -> status, cmd | TacticAst.Alias _ as x -> status, x + | TacticAst.Obj (loc,obj) -> + let status,obj = disambiguate_obj status obj in + status, TacticAst.Obj (loc,obj) let disambiguate_executable status ex = match ex with