open Printf
open MatitaTypes
-let debug = true ;;
+let debug = false ;;
let debug_print = if debug then prerr_endline else ignore ;;
(** create a ProofEngineTypes.mk_fresh_name_type function which uses given
| TacticAst.Reflexivity _ -> Tactics.reflexivity
| TacticAst.Assumption _ -> Tactics.assumption
| TacticAst.Contradiction _ -> Tactics.contradiction
+ | TacticAst.Discriminate (_,term) -> Tactics.discriminate term
| TacticAst.Exists _ -> Tactics.exists
| TacticAst.Fourier _ -> Tactics.fourier
+ | TacticAst.Generalize (_,term,pat) -> Tactics.generalize term pat
| TacticAst.Goal (_, n) -> Tactics.set_goal n
| TacticAst.Left _ -> Tactics.left
| TacticAst.Right _ -> Tactics.right
Tactics.elim_intros term
| TacticAst.ElimType (_, term) -> Tactics.elim_type term
| TacticAst.Replace (_, what, with_what) -> Tactics.replace ~what ~with_what
- | TacticAst.Auto (_,num) ->
- AutoTactic.auto_tac ~num (MatitaDb.instance ())
+ | TacticAst.Auto (_,depth) ->
+(* AutoTactic.auto_tac ~num (MatitaDb.instance ()) *)
+ AutoTactic.auto_tac_new ?depth ~dbd:(MatitaDb.instance ()) ()
| TacticAst.Change (_, what, with_what, _) -> Tactics.change ~what ~with_what
(*
(* TODO Zack a lot more of tactics to be implemented here ... *)
| TacticAst.Change_pattern of 'term pattern * 'term * 'ident option
| TacticAst.Change of 'term * 'term * 'ident option
| TacticAst.Decompose of 'ident * 'ident list
- | TacticAst.Discriminate of 'ident
| TacticAst.Fold of reduction_kind * 'term
| TacticAst.Injection of 'ident
| TacticAst.Replace_pattern of 'term pattern * 'term
*)
| TacticAst.LetIn (loc,term,name) ->
Tactics.letin term ~mk_fresh_name_callback:(namer_of [name])
- | TacticAst.ReduceAt (_,reduction_kind,ident,path) ->
- ProofEngineTypes.mk_tactic
- (fun (((_,metasenv,_,_),goal) as status) ->
- let metano,context,ty = CicUtil.lookup_meta goal metasenv in
- let where, also_in_hypotheses =
- if ident = "goal" then
- ty, false
- else
- let hyp =
- try
- List.find (function
- | Some (Cic.Name name,entry) when name = ident -> true
- | _ -> false)
- context
- with
- Not_found ->
- raise (ProofEngineTypes.Fail
- (ident ^ " is not an hypothesis"))
- in
- (match hyp with
- | Some (_, Cic.Decl term) -> term
- | Some (_, Cic.Def (term,ty)) -> term
- | None -> assert false),true
- in
- let pointers = CicUtil.select ~term:where ~context:path in
- (match reduction_kind with
- | `Normalize ->
- ProofEngineTypes.apply_tactic
- (Tactics.normalize ~also_in_hypotheses ~terms:(Some pointers))
- status
- | `Reduce ->
- ProofEngineTypes.apply_tactic
- (Tactics.reduce ~also_in_hypotheses ~terms:(Some pointers))
- status
- | `Simpl ->
- ProofEngineTypes.apply_tactic
- (Tactics.simpl ~also_in_hypotheses ~terms:(Some pointers))
- status
- | `Whd ->
- ProofEngineTypes.apply_tactic
- (Tactics.whd ~also_in_hypotheses ~terms:(Some pointers))
- status))
- | TacticAst.Reduce (_,reduction_kind,opts) ->
- let terms, also_in_hypotheses =
- match opts with
- | Some (l,`Goal) -> Some l, false
- | Some (l,`Everywhere) -> Some l, true
- | None -> None, false
- in
+ | TacticAst.Reduce (_, reduction_kind, pattern) ->
(match reduction_kind with
- | `Normalize -> Tactics.normalize ~also_in_hypotheses ~terms
- | `Reduce -> Tactics.reduce ~also_in_hypotheses ~terms
- | `Simpl -> Tactics.simpl ~also_in_hypotheses ~terms
- | `Whd -> Tactics.whd ~also_in_hypotheses ~terms)
- | TacticAst.Rewrite (_,dir,t,ident) ->
+ | `Normalize -> Tactics.normalize ~pattern
+ | `Reduce -> Tactics.reduce ~pattern
+ | `Simpl -> Tactics.simpl ~pattern
+ | `Whd -> Tactics.whd ~pattern)
+ | TacticAst.Rewrite (_, dir, t, pattern) ->
if dir = `Left then
- EqualityTactics.rewrite_tac ~term:t
+ EqualityTactics.rewrite_tac ~where:pattern ~term:t ()
else
- EqualityTactics.rewrite_back_tac ~term:t
- | _ -> assert false
+ EqualityTactics.rewrite_back_tac ~where:pattern ~term:t ()
+ | TacticAst.FwdSimpl (_, term) ->
+ Tactics.fwd_simpl ~what:term ~dbd:(MatitaDb.instance ())
+ | TacticAst.LApply (_, to_what, what) ->
+ Tactics.lapply ?to_what what
let eval_tactical status tac =
let apply_tactic tactic =
let context = [] in
let src_uri =
let ty_src = CicReduction.whd context ty_src in
- UriManager.uri_of_string (CicUtil.uri_of_term ty_src)
+ CicUtil.uri_of_term ty_src
in
let tgt_uri =
let ty_tgt = CicReduction.whd context ty_tgt in
- UriManager.uri_of_string (CicUtil.uri_of_term ty_tgt)
+ CicUtil.uri_of_term ty_tgt
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 fields status =
+ let projections = CicRecord.projections_of uri fields 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
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
(DisambiguateTypes.Id id)
- ("boh?",(fun _ _ _ -> CicUtil.term_of_uri uri))
+ ("boh?",(fun _ _ _ -> CicUtil.term_of_uri (UriManager.uri_of_string uri)))
status.aliases }
| TacticAst.Symbol_alias (symb, instance, desc) ->
{status with aliases =
{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) ->
+ let status = generate_elimination_principles uri status in
+ let rec get_record_attrs =
+ function
+ [] -> None
+ | (`Class (`Record fields))::_ -> Some fields
+ | _::tl -> get_record_attrs tl
+ in
+ (match get_record_attrs attrs with
+ None -> status (* not a record *)
+ | Some fields -> generate_projections uri fields status)
+ | Cic.CurrentProof _
+ | Cic.Variable _ -> assert false
let eval_executable status ex =
match ex with
in
status, cic
-let disambiguate_closedtypes status terms =
- let term = CicAst.pack terms in
- let status, term = disambiguate_term status term in
- status, CicUtil.unpack term
+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_pattern aliases (hyp_paths ,goal_path) =
+ let interp path = Disambiguate.interpretate_path [] aliases path in
+ let goal_path =
+ match goal_path with
+ | None -> None
+ | Some path -> Some (interp path) in
+ let hyp_paths = List.map (fun (name, path) -> name, interp path) hyp_paths in
+ (hyp_paths ,goal_path)
let disambiguate_tactic status = function
| TacticAst.Transitivity (loc, term) ->
let status, cic1 = disambiguate_term status what in
let status, cic2 = disambiguate_term status with_what in
status, TacticAst.Replace (loc, cic1, cic2)
- | TacticAst.Change (loc, what, with_what, ident) ->
+ | TacticAst.Change (loc, what, with_what, pattern) ->
let status, cic1 = disambiguate_term status what in
let status, cic2 = disambiguate_term status with_what in
- status, TacticAst.Change (loc, cic1, cic2, ident)
+ let pattern = disambiguate_pattern status.aliases pattern in
+ status, TacticAst.Change (loc, cic1, cic2, pattern)
+ | TacticAst.Generalize (loc,term,pattern) ->
+ let status,term = disambiguate_term status term in
+ let pattern = disambiguate_pattern status.aliases pattern in
+ status, TacticAst.Generalize(loc,term,pattern)
+ | TacticAst.Discriminate (loc,term) ->
+ let status,term = disambiguate_term status term in
+ status, TacticAst.Discriminate(loc,term)
(*
(* TODO Zack a lot more of tactics to be implemented here ... *)
| TacticAst.Change_pattern of 'term pattern * 'term * 'ident option
| TacticAst.Change of 'term * 'term * 'ident option
| TacticAst.Decompose of 'ident * 'ident list
- | TacticAst.Discriminate of 'ident
| TacticAst.Fold of reduction_kind * 'term
| TacticAst.Injection of 'ident
| TacticAst.Replace_pattern of 'term pattern * 'term
*)
- | TacticAst.LetIn (loc,term,name) ->
+ | TacticAst.LetIn (loc, term, name) ->
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
- status, TacticAst.ReduceAt(loc, reduction_kind, ident, path)
- | TacticAst.Reduce (loc, reduction_kind, opts) ->
- let status, opts =
- match opts with
- | None -> status, None
- | Some (l,pat) ->
- let status, l =
- List.fold_right (fun t (status,acc) ->
- let status',t' = disambiguate_term status t in
- status', t'::acc)
- l (status,[])
- in
- status, Some (l, pat)
- in
- status, TacticAst.Reduce (loc, reduction_kind, opts)
- | TacticAst.Rewrite (loc,dir,t,ident) ->
+ | TacticAst.Reduce (loc, reduction_kind, pattern) ->
+ let pattern = disambiguate_pattern status.aliases pattern in
+ status, TacticAst.Reduce(loc, reduction_kind, pattern)
+ | TacticAst.Rewrite (loc, dir, t, pattern) ->
let status, term = disambiguate_term status t in
- status, TacticAst.Rewrite (loc,dir,term,ident)
+ let pattern = disambiguate_pattern status.aliases pattern in
+ status, TacticAst.Rewrite (loc, dir, term, pattern)
| TacticAst.Intros (loc, num, names) ->
status, TacticAst.Intros (loc, num, names)
| TacticAst.Auto (loc,num) -> status, TacticAst.Auto (loc,num)
| TacticAst.Split loc -> status, TacticAst.Split loc
| TacticAst.Symmetry loc -> status, TacticAst.Symmetry loc
| TacticAst.Goal (loc, g) -> status, TacticAst.Goal (loc, g)
- | x ->
- print_endline ("Not yet implemented:" ^ TacticAstPp.pp_tactic x);
- assert false
+ | TacticAst.FwdSimpl (loc, term) ->
+ let status, term = disambiguate_term status term in
+ status, TacticAst.FwdSimpl (loc, term)
+ | TacticAst.LApply (loc, Some to_what, what) ->
+ let status, to_what = disambiguate_term status to_what in
+ let status, what = disambiguate_term status what in
+ status, TacticAst.LApply (loc, Some to_what, what)
+ | TacticAst.LApply (loc, None, what) ->
+ let status, what = disambiguate_term status what in
+ status, TacticAst.LApply (loc, None, what)
let rec disambiguate_tactical status = function
| TacticAst.Tactic (loc, tactic) ->
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
- prerr_endline (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
projects / helm.git / blobdiff