(* $Id$ *)
-open Printf
+module PEH = ProofEngineHelpers
exception Drop
(* mo file name, ma file name *)
exception IncludedFileNotCompiled of string * string
exception Macro of
GrafiteAst.loc *
- (Cic.context -> GrafiteTypes.status * Cic.term GrafiteAst.macro)
-exception ReadOnlyUri of string
+ (Cic.context -> GrafiteTypes.status * (Cic.term,Cic.lazy_term) GrafiteAst.macro)
type 'a disambiguator_input = string * int * 'a
type options = {
do_heavy_checks: bool ;
- clean_baseuri: bool
}
(** create a ProofEngineTypes.mk_fresh_name_type function which uses given
let count = ref 0 in
fun metasenv context name ~typ ->
if !count < len then begin
- let name = Cic.Name (List.nth names !count) in
+ let name = match List.nth names !count with
+ | Some s -> Cic.Name s
+ | None -> Cic.Anonymous
+ in
incr count;
name
end else
FreshNamesGenerator.mk_fresh_name ~subst:[] metasenv context name ~typ
-let tactic_of_ast status ast =
+let rec tactic_of_ast status ast =
let module PET = ProofEngineTypes in
match ast with
+ (* Higher order tactics *)
+ | GrafiteAst.Do (loc, n, tactic) ->
+ Tacticals.do_tactic n (tactic_of_ast status tactic)
+ | GrafiteAst.Seq (loc, tactics) -> (* tac1; tac2; ... *)
+ Tacticals.seq (List.map (tactic_of_ast status) tactics)
+ | GrafiteAst.Repeat (loc, tactic) ->
+ Tacticals.repeat_tactic (tactic_of_ast status tactic)
+ | GrafiteAst.Then (loc, tactic, tactics) -> (* tac; [ tac1 | ... ] *)
+ Tacticals.thens
+ (tactic_of_ast status tactic)
+ (List.map (tactic_of_ast status) tactics)
+ | GrafiteAst.First (loc, tactics) ->
+ Tacticals.first (List.map (tactic_of_ast status) tactics)
+ | GrafiteAst.Try (loc, tactic) ->
+ Tacticals.try_tactic (tactic_of_ast status tactic)
+ | GrafiteAst.Solve (loc, tactics) ->
+ Tacticals.solve_tactics (List.map (tactic_of_ast status) tactics)
+ | GrafiteAst.Progress (loc, tactic) ->
+ Tacticals.progress_tactic (tactic_of_ast status tactic)
+ (* First order tactics *)
| GrafiteAst.Absurd (_, term) -> Tactics.absurd term
| GrafiteAst.Apply (_, term) -> Tactics.apply term
+ | GrafiteAst.ApplyRule (_, term) -> Tactics.apply term
+ | GrafiteAst.ApplyP (_, term) -> Tactics.applyP term
| GrafiteAst.ApplyS (_, term, params) ->
Tactics.applyS ~term ~params ~dbd:(LibraryDb.instance ())
- ~universe:status.GrafiteTypes.universe
+ ~automation_cache:status#automation_cache
| GrafiteAst.Assumption _ -> Tactics.assumption
- | GrafiteAst.Auto (_,params) ->
- AutoTactic.auto_tac ~params ~dbd:(LibraryDb.instance ())
- ~universe:status.GrafiteTypes.universe
- | GrafiteAst.Cases (_, what, names) ->
- Tactics.cases_intros ~mk_fresh_name_callback:(namer_of names)
- what
+ | GrafiteAst.AutoBatch (_,params) ->
+ Tactics.auto ~params ~dbd:(LibraryDb.instance ())
+ ~automation_cache:status#automation_cache
+ | GrafiteAst.Cases (_, what, pattern, (howmany, names)) ->
+ Tactics.cases_intros ?howmany ~mk_fresh_name_callback:(namer_of names)
+ ~pattern what
| GrafiteAst.Change (_, pattern, with_what) ->
Tactics.change ~pattern with_what
| GrafiteAst.Clear (_,id) -> Tactics.clear id
| GrafiteAst.ClearBody (_,id) -> Tactics.clearbody id
+ | GrafiteAst.Compose (_,t1,t2,times,(howmany, names)) ->
+ Tactics.compose times t1 t2 ?howmany
+ ~mk_fresh_name_callback:(namer_of names)
| GrafiteAst.Contradiction _ -> Tactics.contradiction
| GrafiteAst.Constructor (_, n) -> Tactics.constructor n
| GrafiteAst.Cut (_, ident, term) ->
- let names = match ident with None -> [] | Some id -> [id] in
+ let names = match ident with None -> [] | Some id -> [Some id] in
Tactics.cut ~mk_fresh_name_callback:(namer_of names) term
| GrafiteAst.Decompose (_, names) ->
let mk_fresh_name_callback = namer_of names in
Tactics.decompose ~mk_fresh_name_callback ()
- | GrafiteAst.Demodulate _ ->
+ | GrafiteAst.Demodulate (_, params) ->
Tactics.demodulate
- ~dbd:(LibraryDb.instance ()) ~universe:status.GrafiteTypes.universe
- | GrafiteAst.Destruct (_,term) -> Tactics.destruct term
- | GrafiteAst.Elim (_, what, using, pattern, depth, names) ->
+ ~dbd:(LibraryDb.instance ()) ~params
+ ~automation_cache:status#automation_cache
+ | GrafiteAst.Destruct (_,xterms) -> Tactics.destruct xterms
+ | GrafiteAst.Elim (_, what, using, pattern, (depth, names)) ->
Tactics.elim_intros ?using ?depth ~mk_fresh_name_callback:(namer_of names)
~pattern what
- | GrafiteAst.ElimType (_, what, using, depth, names) ->
+ | GrafiteAst.ElimType (_, what, using, (depth, names)) ->
Tactics.elim_type ?using ?depth ~mk_fresh_name_callback:(namer_of names)
what
| GrafiteAst.Exact (_, term) -> Tactics.exact term
| `Normalize ->
PET.const_lazy_reduction
(CicReduction.normalize ~delta:false ~subst:[])
- | `Reduce -> PET.const_lazy_reduction ProofEngineReduction.reduce
| `Simpl -> PET.const_lazy_reduction ProofEngineReduction.simpl
| `Unfold None ->
PET.const_lazy_reduction (ProofEngineReduction.unfold ?what:None)
Tactics.fwd_simpl ~mk_fresh_name_callback:(namer_of names)
~dbd:(LibraryDb.instance ()) hyp
| GrafiteAst.Generalize (_,pattern,ident) ->
- let names = match ident with None -> [] | Some id -> [id] in
+ let names = match ident with None -> [] | Some id -> [Some id] in
Tactics.generalize ~mk_fresh_name_callback:(namer_of names) pattern
- | GrafiteAst.Goal (_, n) -> Tactics.set_goal n
| GrafiteAst.IdTac _ -> Tactics.id
- | GrafiteAst.Intros (_, None, names) ->
- PrimitiveTactics.intros_tac ~mk_fresh_name_callback:(namer_of names) ()
- | GrafiteAst.Intros (_, Some num, names) ->
- PrimitiveTactics.intros_tac ~howmany:num
+ | GrafiteAst.Intros (_, (howmany, names)) ->
+ PrimitiveTactics.intros_tac ?howmany
~mk_fresh_name_callback:(namer_of names) ()
| GrafiteAst.Inversion (_, term) ->
Tactics.inversion term
| GrafiteAst.LApply (_, linear, how_many, to_what, what, ident) ->
- let names = match ident with None -> [] | Some id -> [id] in
+ let names = match ident with None -> [] | Some id -> [Some id] in
Tactics.lapply ~mk_fresh_name_callback:(namer_of names)
~linear ?how_many ~to_what what
| GrafiteAst.Left _ -> Tactics.left
| GrafiteAst.LetIn (loc,term,name) ->
- Tactics.letin term ~mk_fresh_name_callback:(namer_of [name])
+ Tactics.letin term ~mk_fresh_name_callback:(namer_of [Some name])
| GrafiteAst.Reduce (_, reduction_kind, pattern) ->
(match reduction_kind with
| `Normalize -> Tactics.normalize ~pattern
- | `Reduce -> Tactics.reduce ~pattern
| `Simpl -> Tactics.simpl ~pattern
| `Unfold what -> Tactics.unfold ~pattern what
| `Whd -> Tactics.whd ~pattern)
| GrafiteAst.Replace (_, pattern, with_what) ->
Tactics.replace ~pattern ~with_what
| GrafiteAst.Rewrite (_, direction, t, pattern, names) ->
- EqualityTactics.rewrite_tac ~direction ~pattern t names
+ EqualityTactics.rewrite_tac ~direction ~pattern t
+(* to be replaced with ~mk_fresh_name_callback:(namer_of names) *)
+ (List.map (function Some s -> s | None -> assert false) names)
| GrafiteAst.Right _ -> Tactics.right
| GrafiteAst.Ring _ -> Tactics.ring
| GrafiteAst.Split _ -> Tactics.split
- | GrafiteAst.Subst _ -> Tactics.subst
| GrafiteAst.Symmetry _ -> Tactics.symmetry
| GrafiteAst.Transitivity (_, term) -> Tactics.transitivity term
(* Implementazioni Aggiunte *)
| GrafiteAst.Assume (_, id, t) -> Declarative.assume id t
| GrafiteAst.Suppose (_, t, id, t1) -> Declarative.suppose t id t1
- | GrafiteAst.By_term_we_proved (_, t, ty, id, t1) ->
- Declarative.by_term_we_proved ~dbd:(LibraryDb.instance())
- ~universe:status.GrafiteTypes.universe t ty id t1
+ | GrafiteAst.By_just_we_proved (_, just, ty, id, t1) ->
+ Declarative.by_just_we_proved ~dbd:(LibraryDb.instance())
+ ~automation_cache:status#automation_cache just ty id t1
| GrafiteAst.We_need_to_prove (_, t, id, t2) ->
Declarative.we_need_to_prove t id t2
| GrafiteAst.Bydone (_, t) ->
Declarative.bydone ~dbd:(LibraryDb.instance())
- ~universe:status.GrafiteTypes.universe t
+ ~automation_cache:status#automation_cache t
| GrafiteAst.We_proceed_by_cases_on (_, t, t1) ->
Declarative.we_proceed_by_cases_on t t1
| GrafiteAst.We_proceed_by_induction_on (_, t, t1) ->
Declarative.we_proceed_by_induction_on t t1
| GrafiteAst.Byinduction (_, t, id) -> Declarative.byinduction t id
| GrafiteAst.Thesisbecomes (_, t) -> Declarative.thesisbecomes t
- | GrafiteAst.ExistsElim (_, t, id1, t1, id2, t2) ->
+ | GrafiteAst.ExistsElim (_, just, id1, t1, id2, t2) ->
Declarative.existselim ~dbd:(LibraryDb.instance())
- ~universe:status.GrafiteTypes.universe t id1 t1 id2 t2
+ ~automation_cache:status#automation_cache just id1 t1 id2 t2
| GrafiteAst.Case (_,id,params) -> Declarative.case id params
- | GrafiteAst.AndElim(_,t,id1,t1,id2,t2) -> Declarative.andelim t id1 t1 id2 t2
+ | GrafiteAst.AndElim(_,just,id1,t1,id2,t2) ->
+ Declarative.andelim ~dbd:(LibraryDb.instance ())
+ ~automation_cache:status#automation_cache just id1 t1 id2 t2
| GrafiteAst.RewritingStep (_,termine,t1,t2,cont) ->
Declarative.rewritingstep ~dbd:(LibraryDb.instance ())
- ~universe:status.GrafiteTypes.universe termine t1 t2 cont
+ ~automation_cache:status#automation_cache termine t1 t2 cont
let classify_tactic tactic =
match tactic with
| GrafiteAst.Generalize _
| GrafiteAst.Elim _
| GrafiteAst.Cut _
- | GrafiteAst.Decompose _ -> true, true
- (* tactics we don't want to reorder goals. I think only Goal needs this. *)
- | GrafiteAst.Goal _ -> false, true
+ | GrafiteAst.Decompose _ -> true
(* tactics like apply *)
- | _ -> true, false
+ | _ -> false
let reorder_metasenv start refine tactic goals current_goal always_opens_a_goal=
- let module PEH = ProofEngineHelpers in
(* let print_m name metasenv =
prerr_endline (">>>>> " ^ name);
prerr_endline (CicMetaSubst.ppmetasenv [] metasenv)
before @ produced_metas @ after, goals
let apply_tactic ~disambiguate_tactic (text,prefix_len,tactic) (status, goal) =
-(* prerr_endline "apply_tactic"; *)
-(* prerr_endline (Continuationals.Stack.pp (GrafiteTypes.get_stack status)); *)
let starting_metasenv = GrafiteTypes.get_proof_metasenv status in
let before = List.map (fun g, _, _ -> g) starting_metasenv in
-(* prerr_endline "disambiguate"; *)
let status, tactic = disambiguate_tactic status goal (text,prefix_len,tactic) in
let metasenv_after_refinement = GrafiteTypes.get_proof_metasenv status in
let proof = GrafiteTypes.get_current_proof status in
let proof_status = proof, goal in
- let needs_reordering, always_opens_a_goal = classify_tactic tactic in
+ let always_opens_a_goal = classify_tactic tactic in
let tactic = tactic_of_ast status tactic in
- (* apply tactic will change the lexicon_status ... *)
-(* prerr_endline "apply_tactic bassa"; *)
let (proof, opened) = ProofEngineTypes.apply_tactic tactic proof_status in
let after = ProofEngineTypes.goals_of_proof proof in
let opened_goals, closed_goals = Tacticals.goals_diff ~before ~after ~opened in
-(* prerr_endline("before: " ^ String.concat ", " (List.map string_of_int before));
-prerr_endline("after: " ^ String.concat ", " (List.map string_of_int after));
-prerr_endline("opened: " ^ String.concat ", " (List.map string_of_int opened)); *)
-(* prerr_endline("opened_goals: " ^ String.concat ", " (List.map string_of_int opened_goals));
-prerr_endline("closed_goals: " ^ String.concat ", " (List.map string_of_int closed_goals)); *)
let proof, opened_goals =
- if needs_reordering then begin
- let uri, metasenv_after_tactic, t, ty, attrs = proof in
-(* prerr_endline ("goal prima del riordino: " ^ String.concat " " (List.map string_of_int (ProofEngineTypes.goals_of_proof proof))); *)
- let reordered_metasenv, opened_goals =
- reorder_metasenv
- starting_metasenv
- metasenv_after_refinement metasenv_after_tactic
- opened goal always_opens_a_goal
- in
- let proof' = uri, reordered_metasenv, t, ty, attrs in
-(* prerr_endline ("goal dopo il riordino: " ^ String.concat " " (List.map string_of_int (ProofEngineTypes.goals_of_proof proof'))); *)
- proof', opened_goals
- end
- else
- proof, opened_goals
+ let uri, metasenv_after_tactic, subst, t, ty, attrs = proof in
+ let reordered_metasenv, opened_goals =
+ reorder_metasenv
+ starting_metasenv
+ metasenv_after_refinement metasenv_after_tactic
+ opened goal always_opens_a_goal
+ in
+ let proof' = uri, reordered_metasenv, [], t, ty, attrs in
+ proof', opened_goals
in
let incomplete_proof =
- match status.GrafiteTypes.proof_status with
+ match status#proof_status with
| GrafiteTypes.Incomplete_proof p -> p
| _ -> assert false
in
- { status with GrafiteTypes.proof_status =
- GrafiteTypes.Incomplete_proof
- { incomplete_proof with GrafiteTypes.proof = proof } },
+ status#set_proof_status
+ (GrafiteTypes.Incomplete_proof
+ { incomplete_proof with GrafiteTypes.proof = proof }),
opened_goals, closed_goals
+let apply_atomic_tactical ~disambiguate_tactic ~patch (text,prefix_len,tactic) (status, goal) =
+ let starting_metasenv = GrafiteTypes.get_proof_metasenv status in
+ let before = List.map (fun g, _, _ -> g) starting_metasenv in
+ let status, tactic = disambiguate_tactic status goal (text,prefix_len,tactic) in
+ let metasenv_after_refinement = GrafiteTypes.get_proof_metasenv status in
+ let proof = GrafiteTypes.get_current_proof status in
+ let proof_status = proof, goal in
+ let always_opens_a_goal = classify_tactic tactic in
+ let tactic = tactic_of_ast status tactic in
+ let tactic = patch tactic in
+ let (proof, opened) = ProofEngineTypes.apply_tactic tactic proof_status in
+ let after = ProofEngineTypes.goals_of_proof proof in
+ let opened_goals, closed_goals = Tacticals.goals_diff ~before ~after ~opened in
+ let proof, opened_goals =
+ let uri, metasenv_after_tactic, _subst, t, ty, attrs = proof in
+ let reordered_metasenv, opened_goals =
+ reorder_metasenv
+ starting_metasenv
+ metasenv_after_refinement metasenv_after_tactic
+ opened goal always_opens_a_goal
+ in
+ let proof' = uri, reordered_metasenv, _subst, t, ty, attrs in
+ proof', opened_goals
+ in
+ let incomplete_proof =
+ match status#proof_status with
+ | GrafiteTypes.Incomplete_proof p -> p
+ | _ -> assert false
+ in
+ status#set_proof_status
+ (GrafiteTypes.Incomplete_proof
+ { incomplete_proof with GrafiteTypes.proof = proof }),
+ opened_goals, closed_goals
type eval_ast =
{ea_go:
'term 'lazy_term 'reduction 'obj 'ident.
disambiguate_macro:
(GrafiteTypes.status ->
- ('term GrafiteAst.macro) disambiguator_input ->
- Cic.context -> GrafiteTypes.status * Cic.term GrafiteAst.macro) ->
+ (('term,'lazy_term) GrafiteAst.macro) disambiguator_input ->
+ Cic.context -> GrafiteTypes.status * (Cic.term,Cic.lazy_term) GrafiteAst.macro) ->
?do_heavy_checks:bool ->
- ?clean_baseuri:bool ->
GrafiteTypes.status ->
(('term, 'lazy_term, 'reduction, 'obj, 'ident) GrafiteAst.statement)
disambiguator_input ->
- GrafiteTypes.status * UriManager.uri list
+ GrafiteTypes.status * [`Old of UriManager.uri list | `New of NUri.uri list]
}
type 'a eval_command =
GrafiteTypes.status * (Cic.term,Cic.obj) GrafiteAst.command) ->
options -> GrafiteTypes.status ->
(('term,'obj) GrafiteAst.command) disambiguator_input ->
- GrafiteTypes.status * UriManager.uri list
+ GrafiteTypes.status * [`Old of UriManager.uri list | `New of NUri.uri list]
+ }
+
+type 'a eval_comment =
+ {ecm_go: 'term 'lazy_term 'reduction_kind 'obj 'ident.
+ disambiguate_command:
+ (GrafiteTypes.status -> (('term,'obj) GrafiteAst.command) disambiguator_input ->
+ GrafiteTypes.status * (Cic.term,Cic.obj) GrafiteAst.command) ->
+ options -> GrafiteTypes.status ->
+ (('term,'lazy_term,'reduction_kind,'obj,'ident) GrafiteAst.comment) disambiguator_input ->
+ GrafiteTypes.status * [`Old of UriManager.uri list | `New of NUri.uri list]
}
type 'a eval_executable =
disambiguate_macro:
(GrafiteTypes.status ->
- ('term GrafiteAst.macro) disambiguator_input ->
- Cic.context -> GrafiteTypes.status * Cic.term GrafiteAst.macro) ->
+ (('term,'lazy_term) GrafiteAst.macro) disambiguator_input ->
+ Cic.context -> GrafiteTypes.status * (Cic.term,Cic.lazy_term) GrafiteAst.macro) ->
options ->
GrafiteTypes.status ->
(('term, 'lazy_term, 'reduction, 'obj, 'ident) GrafiteAst.code) disambiguator_input ->
- GrafiteTypes.status * UriManager.uri list
+ GrafiteTypes.status * [`Old of UriManager.uri list | `New of NUri.uri list]
}
type 'a eval_from_moo =
{ efm_go: GrafiteTypes.status -> string -> GrafiteTypes.status }
-let coercion_moo_statement_of (uri,arity) =
- GrafiteAst.Coercion (HExtlib.dummy_floc, uri, false, arity)
-
-let refinement_toolkit = {
- RefinementTool.type_of_aux' =
- (fun ?localization_tbl e c t u ->
- let saved = !CicRefine.insert_coercions in
- CicRefine.insert_coercions:= false;
- let rc =
- try
- let t, ty, metasenv, ugraph =
- CicRefine.type_of_aux' ?localization_tbl e c t u in
- RefinementTool.Success (t, ty, metasenv, ugraph)
- with
- | CicRefine.RefineFailure s
- | CicRefine.Uncertain s
- | CicRefine.AssertFailure s -> RefinementTool.Exception s
- in
- CicRefine.insert_coercions := saved;
- rc);
- RefinementTool.ppsubst = CicMetaSubst.ppsubst;
- RefinementTool.apply_subst = CicMetaSubst.apply_subst;
- RefinementTool.ppmetasenv = CicMetaSubst.ppmetasenv;
- RefinementTool.pack_coercion_obj = CicRefine.pack_coercion_obj;
- }
-
-let eval_coercion status ~add_composites uri arity baseuri =
- let status,compounds =
- GrafiteSync.add_coercion ~add_composites refinement_toolkit status uri arity
- baseuri
+let coercion_moo_statement_of (uri,arity, saturations,_) =
+ GrafiteAst.Coercion
+ (HExtlib.dummy_floc, CicUtil.term_of_uri uri, false, arity, saturations)
+
+let basic_eval_unification_hint (t,n) status =
+ NCicUnifHint.add_user_provided_hint status t n
+;;
+
+let inject_unification_hint =
+ let basic_eval_unification_hint (t,n)
+ ~refresh_uri_in_universe
+ ~refresh_uri_in_term
+ =
+ let t = refresh_uri_in_term t in basic_eval_unification_hint (t,n)
+ in
+ NRstatus.Serializer.register "unification_hints" basic_eval_unification_hint
+;;
+
+let eval_unification_hint status t n =
+ let metasenv,subst,status,t =
+ GrafiteDisambiguate.disambiguate_nterm None status [] [] [] ("",0,t) in
+ assert (metasenv=[]);
+ let t = NCicUntrusted.apply_subst subst [] t in
+ let status = basic_eval_unification_hint (t,n) status in
+ let dump = inject_unification_hint (t,n)::status#dump in
+ let status = status#set_dump dump in
+ status,`New []
+;;
+
+let basic_eval_ncoercion (name,t,s,d,p,a) status =
+ NCicCoercion.index_coercion status t s d a p
+;;
+
+let inject_ncoercion =
+ let basic_eval_ncoercion x ~refresh_uri_in_universe ~refresh_uri_in_term =
+ basic_eval_ncoercion x
+ in
+ NRstatus.Serializer.register "ncoercion" basic_eval_ncoercion
+;;
+
+let eval_ncoercion status name t ty (id,src) tgt =
+
+ let metasenv,subst,status,ty =
+ GrafiteDisambiguate.disambiguate_nterm None status [] [] [] ("",0,ty) in
+ assert (metasenv=[]);
+ let ty = NCicUntrusted.apply_subst subst [] ty in
+ let metasenv,subst,status,t =
+ GrafiteDisambiguate.disambiguate_nterm (Some ty) status [] [] [] ("",0,t) in
+ assert (metasenv=[]);
+ let t = NCicUntrusted.apply_subst subst [] t in
+
+ let src, cpos =
+ let rec aux cpos ctx = function
+ | NCic.Prod (name,ty,bo) ->
+ if name <> id then aux (cpos+1) ((name,NCic.Decl ty)::ctx) bo
+ else
+ let metasenv,subst,status,src =
+ GrafiteDisambiguate.disambiguate_nterm
+ None status [] [] [] ("",0,src) in
+ let src = NCicUntrusted.apply_subst subst [] src in
+ let _ = NCicUnification.unify status metasenv subst ctx ty src in
+ src, cpos
+ | _ -> assert false
+ in
+ aux 0 [] ty
in
- let moo_content =
- List.map coercion_moo_statement_of ((uri,arity)::compounds)
+ let tgt, arity =
+ let metasenv,subst,status,tgt =
+ GrafiteDisambiguate.disambiguate_nterm
+ None status [] [] [] ("",0,tgt) in
+ let tgt = NCicUntrusted.apply_subst subst [] tgt in
+ (* CHECK *)
+ let rec count_prod = function
+ | NCic.Prod (_,_,x) -> 1 + count_prod x
+ | _ -> 0
+ in
+ tgt, count_prod tgt
in
- let status = GrafiteTypes.add_moo_content moo_content status in
- {status with GrafiteTypes.proof_status = GrafiteTypes.No_proof},
- List.map fst compounds
-
-let eval_tactical ~disambiguate_tactic status tac =
- let apply_tactic = apply_tactic ~disambiguate_tactic in
- let module MatitaStatus =
- struct
- type input_status = GrafiteTypes.status * ProofEngineTypes.goal
-
- type output_status =
- GrafiteTypes.status * ProofEngineTypes.goal list * ProofEngineTypes.goal list
-
- type tactic = input_status -> output_status
-
- let id_tactic = apply_tactic ("",0,(GrafiteAst.IdTac HExtlib.dummy_floc))
- let mk_tactic tac = tac
- let apply_tactic tac = tac
- let goals (_, opened, closed) = opened, closed
- let set_goals (opened, closed) (status, _, _) = (status, opened, closed)
- let get_stack (status, _) = GrafiteTypes.get_stack status
-
- let get_status (status, goal) =
- match status.GrafiteTypes.proof_status with
- | GrafiteTypes.Incomplete_proof incomplete -> incomplete.GrafiteTypes.proof, goal
- | _ -> assert false
-
- let get_proof (status, _, _) =
- match status.GrafiteTypes.proof_status with
- | GrafiteTypes.Incomplete_proof incomplete -> incomplete.GrafiteTypes.proof
- | _ -> assert false
-
- let set_stack stack (status, opened, closed) =
- GrafiteTypes.set_stack stack status, opened, closed
-
- let inject (status, _) = (status, [], [])
- let focus goal (status, _, _) = (status, goal)
- end
+
+ let status = basic_eval_ncoercion (name,t,src,tgt,cpos,arity) status in
+ let dump = inject_ncoercion (name,t,src,tgt,cpos,arity)::status#dump in
+ let status = status#set_dump dump in
+ status,`New []
+;;
+
+let basic_eval_add_constraint (s,u1,u2) status =
+ NCicLibrary.add_constraint status s u1 u2
+;;
+
+let inject_constraint =
+ let basic_eval_add_constraint (s,u1,u2)
+ ~refresh_uri_in_universe
+ ~refresh_uri_in_term
+ =
+ let u1 = refresh_uri_in_universe u1 in
+ let u2 = refresh_uri_in_universe u2 in
+ basic_eval_add_constraint (s,u1,u2)
in
- let module MatitaTacticals = Tacticals.Make (MatitaStatus) in
- let rec tactical_of_ast l (text,prefix_len,tac) =
- let apply_tactic t = apply_tactic (text, prefix_len, t) in
- let tactical_of_ast l t = tactical_of_ast l (text,prefix_len,t) in
- match tac with
- | GrafiteAst.Tactic (loc, tactic) ->
- MatitaTacticals.tactic (MatitaStatus.mk_tactic (apply_tactic tactic))
- | GrafiteAst.Seq (loc, tacticals) -> (* tac1; tac2; ... *)
- assert (l > 0);
- MatitaTacticals.seq ~tactics:(List.map (tactical_of_ast (l+1)) tacticals)
- | GrafiteAst.Do (loc, n, tactical) ->
- MatitaTacticals.do_tactic ~n ~tactic:(tactical_of_ast (l+1) tactical)
- | GrafiteAst.Repeat (loc, tactical) ->
- MatitaTacticals.repeat_tactic ~tactic:(tactical_of_ast (l+1) tactical)
- | GrafiteAst.Then (loc, tactical, tacticals) -> (* tac; [ tac1 | ... ] *)
- assert (l > 0);
- MatitaTacticals.thens ~start:(tactical_of_ast (l+1) tactical)
- ~continuations:(List.map (tactical_of_ast (l+1)) tacticals)
- | GrafiteAst.First (loc, tacticals) ->
- MatitaTacticals.first
- ~tactics:(List.map (fun t -> "", tactical_of_ast (l+1) t) tacticals)
- | GrafiteAst.Try (loc, tactical) ->
- MatitaTacticals.try_tactic ~tactic:(tactical_of_ast (l+1) tactical)
- | GrafiteAst.Solve (loc, tacticals) ->
- MatitaTacticals.solve_tactics
- ~tactics:(List.map (fun t -> "", tactical_of_ast (l+1) t) tacticals)
- | GrafiteAst.Progress (loc, tactical) ->
- MatitaTacticals.progress_tactic ~tactic:(tactical_of_ast (l+1) tactical)
-
- | GrafiteAst.Skip _loc -> MatitaTacticals.skip
- | GrafiteAst.Dot _loc -> MatitaTacticals.dot
- | GrafiteAst.Semicolon _loc -> MatitaTacticals.semicolon
- | GrafiteAst.Branch _loc -> MatitaTacticals.branch
- | GrafiteAst.Shift _loc -> MatitaTacticals.shift
- | GrafiteAst.Pos (_loc, i) -> MatitaTacticals.pos i
- | GrafiteAst.Merge _loc -> MatitaTacticals.merge
- | GrafiteAst.Focus (_loc, goals) -> MatitaTacticals.focus goals
- | GrafiteAst.Unfocus _loc -> MatitaTacticals.unfocus
- | GrafiteAst.Wildcard _loc -> MatitaTacticals.wildcard
+ NRstatus.Serializer.register "constraints" basic_eval_add_constraint
+;;
+
+let eval_add_constraint status s u1 u2 =
+ let status = basic_eval_add_constraint (s,u1,u2) status in
+ let dump = inject_constraint (s,u1,u2)::status#dump in
+ let status = status#set_dump dump in
+ status,`Old []
+;;
+
+let add_coercions_of_lemmas lemmas status =
+ let moo_content =
+ HExtlib.filter_map
+ (fun uri ->
+ match CoercDb.is_a_coercion (Cic.Const (uri,[])) with
+ | None -> None
+ | Some (_,tgt,_,sat,_) ->
+ let arity = match tgt with CoercDb.Fun n -> n | _ -> 0 in
+ Some (coercion_moo_statement_of (uri,arity,sat,0)))
+ lemmas
in
- let status, _, _ = tactical_of_ast 0 tac (status, ~-1) in
+ let status = GrafiteTypes.add_moo_content moo_content status in
+ status#set_coercions (CoercDb.dump ()),
+ lemmas
+
+let eval_coercion status ~add_composites uri arity saturations =
+ let uri =
+ try CicUtil.uri_of_term uri
+ with Invalid_argument _ ->
+ raise (Invalid_argument "coercion can only be constants/constructors")
+ in
+ let status, lemmas =
+ GrafiteSync.add_coercion ~add_composites
+ ~pack_coercion_obj:CicRefine.pack_coercion_obj
+ status uri arity saturations status#baseuri in
+ let moo_content = coercion_moo_statement_of (uri,arity,saturations,0) in
+ let status = GrafiteTypes.add_moo_content [moo_content] status in
+ add_coercions_of_lemmas lemmas status
+
+let eval_prefer_coercion status c =
+ let uri =
+ try CicUtil.uri_of_term c
+ with Invalid_argument _ ->
+ raise (Invalid_argument "coercion can only be constants/constructors")
+ in
+ let status = GrafiteSync.prefer_coercion status uri in
+ let moo_content = GrafiteAst.PreferCoercion (HExtlib.dummy_floc,c) in
+ let status = GrafiteTypes.add_moo_content [moo_content] status in
+ status, `Old []
+
+module MatitaStatus =
+ struct
+ type input_status = GrafiteTypes.status * ProofEngineTypes.goal
+
+ type output_status =
+ GrafiteTypes.status * ProofEngineTypes.goal list * ProofEngineTypes.goal list
+
+ type tactic = input_status -> output_status
+
+ let mk_tactic tac = tac
+ let apply_tactic tac = tac
+ let goals (_, opened, closed) = opened, closed
+ let get_stack (status, _) = GrafiteTypes.get_stack status
+
+ let set_stack stack (status, opened, closed) =
+ GrafiteTypes.set_stack stack status, opened, closed
+
+ let inject (status, _) = (status, [], [])
+ let focus goal (status, _, _) = (status, goal)
+ end
+
+module MatitaTacticals = Continuationals.Make(MatitaStatus)
+
+let tactic_of_ast' tac =
+ MatitaTacticals.Tactical (MatitaTacticals.Tactic (MatitaStatus.mk_tactic tac))
+
+let punctuation_tactical_of_ast (text,prefix_len,punct) =
+ match punct with
+ | GrafiteAst.Dot _loc -> MatitaTacticals.Dot
+ | GrafiteAst.Semicolon _loc -> MatitaTacticals.Semicolon
+ | GrafiteAst.Branch _loc -> MatitaTacticals.Branch
+ | GrafiteAst.Shift _loc -> MatitaTacticals.Shift
+ | GrafiteAst.Pos (_loc, i) -> MatitaTacticals.Pos i
+ | GrafiteAst.Merge _loc -> MatitaTacticals.Merge
+ | GrafiteAst.Wildcard _loc -> MatitaTacticals.Wildcard
+
+let non_punctuation_tactical_of_ast (text,prefix_len,punct) =
+ match punct with
+ | GrafiteAst.Focus (_loc,goals) -> MatitaTacticals.Focus goals
+ | GrafiteAst.Unfocus _loc -> MatitaTacticals.Unfocus
+ | GrafiteAst.Skip _loc -> MatitaTacticals.Tactical MatitaTacticals.Skip
+
+let eval_tactical status tac =
+ let status, _, _ = MatitaTacticals.eval tac (status, ~-1) in
let status = (* is proof completed? *)
- match status.GrafiteTypes.proof_status with
+ match status#proof_status with
| GrafiteTypes.Incomplete_proof
{ GrafiteTypes.stack = stack; proof = proof }
when Continuationals.Stack.is_empty stack ->
- { status with GrafiteTypes.proof_status = GrafiteTypes.Proof proof }
+ status#set_proof_status (GrafiteTypes.Proof proof)
| _ -> status
in
status
-let eval_comment status c = status
-
-(* since the record syntax allows to declare coercions, we have to put this
- * information inside the moo *)
-let add_coercions_of_record_to_moo obj lemmas status =
- let attributes = CicUtil.attributes_of_obj obj in
- let is_record = function `Class (`Record att) -> Some att | _-> None in
- match HExtlib.list_findopt is_record attributes with
- | None -> status,[]
- | Some fields ->
- let is_a_coercion uri =
- try
- let obj,_ =
- CicEnvironment.get_cooked_obj CicUniv.empty_ugraph uri in
- let attrs = CicUtil.attributes_of_obj obj in
- try
- match List.find
- (function `Class (`Coercion _) -> true | _-> false) attrs
- with `Class (`Coercion n) -> true,n | _ -> assert false
- with Not_found -> false,0
- with Not_found -> assert false
- in
- (* looking at the fields we can know the 'wanted' coercions, but not the
- * actually generated ones. So, only the intersection between the wanted
- * and the actual should be in the moo as coercion, while everithing in
- * lemmas should go as aliases *)
- let wanted_coercions =
- HExtlib.filter_map
- (function
- | (name,true,arity) ->
- Some
- (arity, UriManager.uri_of_string
- (GrafiteTypes.qualify status name ^ ".con"))
- | _ -> None)
- fields
- in
- (*prerr_endline "wanted coercions:";
- List.iter
- (fun u -> prerr_endline (UriManager.string_of_uri u))
- wanted_coercions; *)
- let coercions, moo_content =
- List.split
- (HExtlib.filter_map
- (fun uri ->
- let is_a_wanted_coercion,arity_wanted =
- try
- let arity,_ =
- List.find (fun (n,u) -> UriManager.eq u uri)
- wanted_coercions
- in
- true, arity
- with Not_found -> false, 0
- in
- let is_a_coercion, arity_coercion = is_a_coercion uri in
- if is_a_coercion then
- Some (uri, coercion_moo_statement_of (uri,arity_coercion))
- else if is_a_wanted_coercion then
- Some (uri, coercion_moo_statement_of (uri,arity_wanted))
- else
- None)
- lemmas)
- in
- (*prerr_endline "actual coercions:";
- List.iter
- (fun u -> prerr_endline (UriManager.string_of_uri u))
- coercions;
- prerr_endline "lemmas was:";
- List.iter
- (fun u -> prerr_endline (UriManager.string_of_uri u))
- lemmas; *)
- let status = GrafiteTypes.add_moo_content moo_content status in
- {status with
- GrafiteTypes.coercions = coercions @ status.GrafiteTypes.coercions},
- lemmas
+let add_obj = GrafiteSync.add_obj ~pack_coercion_obj:CicRefine.pack_coercion_obj
-let add_obj uri obj status =
- let status,lemmas = GrafiteSync.add_obj refinement_toolkit uri obj status in
- status, lemmas
+let eval_ng_punct (_text, _prefix_len, punct) =
+ match punct with
+ | GrafiteAst.Dot _ -> NTactics.dot_tac
+ | GrafiteAst.Semicolon _ -> fun x -> x
+ | GrafiteAst.Branch _ -> NTactics.branch_tac
+ | GrafiteAst.Shift _ -> NTactics.shift_tac
+ | GrafiteAst.Pos (_,l) -> NTactics.pos_tac l
+ | GrafiteAst.Wildcard _ -> NTactics.wildcard_tac
+ | GrafiteAst.Merge _ -> NTactics.merge_tac
+;;
+
+let eval_ng_tac tac =
+ let rec aux f (text, prefix_len, tac) =
+ match tac with
+ | GrafiteAst.NApply (_loc, t) -> NTactics.apply_tac (text,prefix_len,t)
+ | GrafiteAst.NAssert (_loc, seqs) ->
+ NTactics.assert_tac
+ ((List.map
+ (function (hyps,concl) ->
+ List.map
+ (function
+ (id,`Decl t) -> id,`Decl (text,prefix_len,t)
+ |(id,`Def (b,t))->id,`Def((text,prefix_len,b),(text,prefix_len,t))
+ ) hyps,
+ (text,prefix_len,concl))
+ ) seqs)
+ | GrafiteAst.NAuto (_loc, (l,a)) ->
+ NTactics.auto_tac
+ ~params:(List.map (fun x -> "",0,x) l,a)
+ | GrafiteAst.NBranch _ -> NTactics.branch_tac
+ | GrafiteAst.NCases (_loc, what, where) ->
+ NTactics.cases_tac
+ ~what:(text,prefix_len,what)
+ ~where:(text,prefix_len,where)
+ | GrafiteAst.NCase1 (_loc,n) -> NTactics.case1_tac n
+ | GrafiteAst.NChange (_loc, pat, ww) ->
+ NTactics.change_tac
+ ~where:(text,prefix_len,pat) ~with_what:(text,prefix_len,ww)
+ | GrafiteAst.NDot _ -> NTactics.dot_tac
+ | GrafiteAst.NElim (_loc, what, where) ->
+ NTactics.elim_tac
+ ~what:(text,prefix_len,what)
+ ~where:(text,prefix_len,where)
+ | GrafiteAst.NFocus (_,l) -> NTactics.focus_tac l
+ | GrafiteAst.NGeneralize (_loc, where) ->
+ NTactics.generalize_tac ~where:(text,prefix_len,where)
+ | GrafiteAst.NId _ -> (fun x -> x)
+ | GrafiteAst.NIntro (_loc,n) -> NTactics.intro_tac n
+ | GrafiteAst.NLetIn (_loc,where,what,name) ->
+ NTactics.letin_tac ~where:(text,prefix_len,where)
+ ~what:(text,prefix_len,what) name
+ | GrafiteAst.NMerge _ -> NTactics.merge_tac
+ | GrafiteAst.NPos (_,l) -> NTactics.pos_tac l
+ | GrafiteAst.NReduce (_loc, reduction, where) ->
+ NTactics.reduce_tac ~reduction ~where:(text,prefix_len,where)
+ | GrafiteAst.NRewrite (_loc,dir,what,where) ->
+ NTactics.rewrite_tac ~dir ~what:(text,prefix_len,what)
+ ~where:(text,prefix_len,where)
+ | GrafiteAst.NSemicolon _ -> fun x -> x
+ | GrafiteAst.NShift _ -> NTactics.shift_tac
+ | GrafiteAst.NSkip _ -> NTactics.skip_tac
+ | GrafiteAst.NUnfocus _ -> NTactics.unfocus_tac
+ | GrafiteAst.NWildcard _ -> NTactics.wildcard_tac
+ | GrafiteAst.NTry (_,tac) -> NTactics.try_tac
+ (aux f (text, prefix_len, tac))
+ | GrafiteAst.NAssumption _ -> NTactics.assumption_tac
+ | GrafiteAst.NBlock (_,l) ->
+ NTactics.block_tac (List.map (fun x -> aux f (text,prefix_len,x)) l)
+ |GrafiteAst.NRepeat (_,tac) ->
+ NTactics.repeat_tac (f f (text, prefix_len, tac))
+ in
+ aux aux tac (* trick for non uniform recursion call *)
+;;
+let subst_metasenv_and_fix_names status =
+ let u,h,metasenv, subst,o = status#obj in
+ let o =
+ NCicUntrusted.map_obj_kind ~skip_body:true
+ (NCicUntrusted.apply_subst subst []) o
+ in
+ status#set_obj(u,h,NCicUntrusted.apply_subst_metasenv subst metasenv,subst,o)
+;;
+
+let rec eval_ncommand opts status (text,prefix_len,cmd) =
+ match cmd with
+ | GrafiteAst.UnificationHint (loc, t, n) -> eval_unification_hint status t n
+ | GrafiteAst.NCoercion (loc, name, t, ty, source, target) ->
+ eval_ncoercion status name t ty source target
+ | GrafiteAst.NQed loc ->
+ if status#ng_mode <> `ProofMode then
+ raise (GrafiteTypes.Command_error "Not in proof mode")
+ else
+ let uri,height,menv,subst,obj_kind = status#obj in
+ if menv <> [] then
+ raise
+ (GrafiteTypes.Command_error"You can't Qed an incomplete theorem")
+ else
+ let obj_kind =
+ NCicUntrusted.map_obj_kind
+ (NCicUntrusted.apply_subst subst []) obj_kind in
+ let height = NCicTypeChecker.height_of_obj_kind uri [] obj_kind in
+ (* fix the height inside the object *)
+ let rec fix () = function
+ | NCic.Const (NReference.Ref (u,spec)) when NUri.eq u uri ->
+ NCic.Const (NReference.reference_of_spec u
+ (match spec with
+ | NReference.Def _ -> NReference.Def height
+ | NReference.Fix (i,j,_) -> NReference.Fix(i,j,height)
+ | NReference.CoFix _ -> NReference.CoFix height
+ | NReference.Ind _ | NReference.Con _
+ | NReference.Decl as s -> s))
+ | t -> NCicUtils.map (fun _ () -> ()) () fix t
+ in
+ let obj_kind =
+ match obj_kind with
+ | NCic.Fixpoint _ ->
+ NCicUntrusted.map_obj_kind (fix ()) obj_kind
+ | _ -> obj_kind
+ in
+ let obj = uri,height,[],[],obj_kind in
+ let status = NCicLibrary.add_obj status obj in
+ let objs = NCicElim.mk_elims obj in
+ let timestamp,uris_rev =
+ List.fold_left
+ (fun (status,uris_rev) (uri,_,_,_,_) as obj ->
+ let status = NCicLibrary.add_obj status obj in
+ status,uri::uris_rev
+ ) (status,[]) objs in
+ let uris = uri::List.rev uris_rev in
+ status#set_ng_mode `CommandMode,`New uris
+ | GrafiteAst.NObj (loc,obj) ->
+ if status#ng_mode <> `CommandMode then
+ raise (GrafiteTypes.Command_error "Not in command mode")
+ else
+ let status,obj =
+ GrafiteDisambiguate.disambiguate_nobj status
+ ~baseuri:status#baseuri (text,prefix_len,obj) in
+ let uri,height,nmenv,nsubst,nobj = obj in
+ let ninitial_stack = Continuationals.Stack.of_nmetasenv nmenv in
+ let status = status#set_obj obj in
+ let status = status#set_stack ninitial_stack in
+ let status = subst_metasenv_and_fix_names status in
+ let status = status#set_ng_mode `ProofMode in
+ (match nmenv with
+ [] ->
+ eval_ncommand opts status ("",0,GrafiteAst.NQed Stdpp.dummy_loc)
+ | _ -> status,`New [])
+ | GrafiteAst.NUnivConstraint (loc,strict,u1,u2) ->
+ eval_add_constraint status strict [false,u1] [false,u2]
+;;
+
let rec eval_command = {ec_go = fun ~disambiguate_command opts status
(text,prefix_len,cmd) ->
let status,cmd = disambiguate_command status (text,prefix_len,cmd) in
| GrafiteAst.Index (loc,None,uri) ->
assert false (* TODO: for user input *)
| GrafiteAst.Index (loc,Some key,uri) ->
- let universe = Universe.index
- status.GrafiteTypes.universe key (CicUtil.term_of_uri uri) in
- let status = {status with GrafiteTypes.universe = universe} in
+ let universe =
+ status#automation_cache.AutomationCache.univ
+ in
+ let universe = Universe.index universe key (CicUtil.term_of_uri uri) in
+ let cache = {
+ status#automation_cache with AutomationCache.univ = universe }
+ in
+ let status = status#set_automation_cache cache in
(* debug
let msg =
let candidates = Universe.get_candidates status.GrafiteTypes.universe key in
prerr_endline msg;
*)
let status = GrafiteTypes.add_moo_content [cmd] status in
- status,[]
- | GrafiteAst.Coercion (loc, uri, add_composites, arity) ->
- eval_coercion status ~add_composites uri arity
- (GrafiteTypes.get_string_option status "baseuri")
+ status,`Old []
+ | GrafiteAst.Select (_,uri) as cmd ->
+ if List.mem cmd status#moo_content_rev then status, `Old []
+ else
+ let cache =
+ AutomationCache.add_term_to_active status#automation_cache
+ [] [] [] (CicUtil.term_of_uri uri) None
+ in
+ let status = status#set_automation_cache cache in
+ let status = GrafiteTypes.add_moo_content [cmd] status in
+ status, `Old []
+ | GrafiteAst.Pump (_,steps) ->
+ let cache =
+ AutomationCache.pump status#automation_cache steps
+ in
+ let status = status#set_automation_cache cache in
+ status, `Old []
+ | GrafiteAst.PreferCoercion (loc, coercion) ->
+ eval_prefer_coercion status coercion
+ | GrafiteAst.Coercion (loc, uri, add_composites, arity, saturations) ->
+ let res,uris =
+ eval_coercion status ~add_composites uri arity saturations
+ in
+ res,`Old uris
+ | GrafiteAst.Inverter (loc, name, indty, params) ->
+ let buri = status#baseuri in
+ let uri = UriManager.uri_of_string (buri ^ "/" ^ name ^ ".con") in
+ let indty_uri =
+ try CicUtil.uri_of_term indty
+ with Invalid_argument _ ->
+ raise (Invalid_argument "not an inductive type to invert") in
+ let res,uris =
+ Inversion_principle.build_inverter ~add_obj status uri indty_uri params
+ in
+ res,`Old uris
| GrafiteAst.Default (loc, what, uris) as cmd ->
LibraryObjects.set_default what uris;
- GrafiteTypes.add_moo_content [cmd] status,[]
+ GrafiteTypes.add_moo_content [cmd] status,`Old []
| GrafiteAst.Drop loc -> raise Drop
- | GrafiteAst.Include (loc, baseuri) ->
- let moopath_rw, moopath_r =
- LibraryMisc.obj_file_of_baseuri
- ~must_exist:false ~baseuri ~writable:true,
- LibraryMisc.obj_file_of_baseuri
- ~must_exist:false ~baseuri ~writable:false
- in
- let moopath =
- if Sys.file_exists moopath_r then moopath_r else
- if Sys.file_exists moopath_rw then moopath_rw else
- raise (IncludedFileNotCompiled (moopath_rw,baseuri))
- in
- let status = eval_from_moo.efm_go status moopath in
-(* debug
- let lt_uri = UriManager.uri_of_string "cic:/matita/nat/orders/lt.con" in
- let nat_uri = UriManager.uri_of_string "cic:/matita/nat/nat/nat.ind" in
- let nat = Cic.MutInd(nat_uri,0,[]) in
- let zero = Cic.MutConstruct(nat_uri,0,1,[]) in
- let succ = Cic.MutConstruct(nat_uri,0,2,[]) in
- let fake= Cic.Meta(-1,[]) in
- let term= Cic.Appl [Cic.Const (lt_uri,[]);zero;Cic.Appl[succ;zero]] in let msg =
- let candidates = Universe.get_candidates status.GrafiteTypes.universe term in
- ("candidates for " ^ (CicPp.ppterm term) ^ " = " ^
- (String.concat "\n" (List.map CicPp.ppterm candidates)))
+ | GrafiteAst.Include (loc, mode, new_or_old, baseuri) ->
+ (* Old Include command is not recursive; new one is *)
+ let status =
+ if new_or_old = `OldAndNew then
+ let moopath_rw, moopath_r =
+ LibraryMisc.obj_file_of_baseuri
+ ~must_exist:false ~baseuri ~writable:true,
+ LibraryMisc.obj_file_of_baseuri
+ ~must_exist:false ~baseuri ~writable:false in
+ let moopath =
+ if Sys.file_exists moopath_r then moopath_r else
+ if Sys.file_exists moopath_rw then moopath_rw else
+ raise (IncludedFileNotCompiled (moopath_rw,baseuri))
+ in
+ eval_from_moo.efm_go status moopath
+ else
+ status
in
- prerr_endline msg;
-*)
- status,[]
+ let status =
+ NRstatus.Serializer.require ~baseuri:(NUri.uri_of_string baseuri)
+ status in
+ let status =
+ GrafiteTypes.add_moo_content
+ [GrafiteAst.Include (loc,mode,`New,baseuri)] status
+ in
+ status,`Old []
| GrafiteAst.Print (_,"proofterm") ->
- let _,_,p,_, _ = GrafiteTypes.get_current_proof status in
- print_endline (AutoTactic.pp_proofterm p);
- status,[]
- | GrafiteAst.Print (_,_) -> status,[]
+ let _,_,_,p,_, _ = GrafiteTypes.get_current_proof status in
+ prerr_endline (Auto.pp_proofterm (Lazy.force p));
+ status,`Old []
+ | GrafiteAst.Print (_,_) -> status,`Old []
| GrafiteAst.Qed loc ->
- let uri, metasenv, bo, ty, attrs =
- match status.GrafiteTypes.proof_status with
- | GrafiteTypes.Proof (Some uri, metasenv, body, ty, attrs) ->
- uri, metasenv, body, ty, attrs
- | GrafiteTypes.Proof (None, metasenv, body, ty, attrs) ->
+ let uri, metasenv, _subst, bo, ty, attrs =
+ match status#proof_status with
+ | GrafiteTypes.Proof (Some uri, metasenv, subst, body, ty, attrs) ->
+ uri, metasenv, subst, body, ty, attrs
+ | GrafiteTypes.Proof (None, metasenv, subst, body, ty, attrs) ->
raise (GrafiteTypes.Command_error
("Someone allows to start a theorem without giving the "^
"name/uri. This should be fixed!"))
(GrafiteTypes.Command_error
"Proof not completed! metasenv is not empty!");
let name = UriManager.name_of_uri uri in
- let obj = Cic.Constant (name,Some bo,ty,[],attrs) in
+ let obj = Cic.Constant (name,Some (Lazy.force bo),ty,[],attrs) in
let status, lemmas = add_obj uri obj status in
- {status with
- GrafiteTypes.proof_status = GrafiteTypes.No_proof},
+ status#set_proof_status GrafiteTypes.No_proof,
(*CSC: I throw away the arities *)
- uri::lemmas
+ `Old (uri::lemmas)
| GrafiteAst.Relation (loc, id, a, aeq, refl, sym, trans) ->
Setoids.add_relation id a aeq refl sym trans;
- status, [] (*CSC: TO BE FIXED *)
- | GrafiteAst.Set (loc, name, value) ->
- if name = "baseuri" then begin
- let value =
- let v = Http_getter_misc.strip_trailing_slash value in
- try
- ignore (String.index v ' ');
- GrafiteTypes.command_error "baseuri can't contain spaces"
- with Not_found -> v
- in
- if Http_getter_storage.is_read_only value then begin
- HLog.error (sprintf "uri %s belongs to a read-only repository" value);
- raise (ReadOnlyUri value)
- end;
- if not (Http_getter_storage.is_empty value) &&
- opts.clean_baseuri
- then begin
- HLog.message ("baseuri " ^ value ^ " is not empty");
- HLog.message ("cleaning baseuri " ^ value);
- LibraryClean.clean_baseuris [value];
- assert (Http_getter_storage.is_empty value);
- end;
- if not (Helm_registry.get_opt_default Helm_registry.bool "matita.nodisk"
- ~default:false)
- then
- HExtlib.mkdir
- (Filename.dirname (Http_getter.filename ~writable:true (value ^
- "/foo.con")));
- end;
- GrafiteTypes.set_option status name value,[]
+ status, `Old [] (*CSC: TO BE FIXED *)
+ | GrafiteAst.Set (loc, name, value) -> status, `Old []
+(* GrafiteTypes.set_option status name value,[] *)
| GrafiteAst.Obj (loc,obj) ->
let ext,name =
match obj with
".ind",
(match types with (name,_,_,_)::_ -> name | _ -> assert false)
| _ -> assert false in
- let uri =
- UriManager.uri_of_string (GrafiteTypes.qualify status name ^ ext) in
+ let buri = status#baseuri in
+ let uri = UriManager.uri_of_string (buri ^ "/" ^ name ^ ext) in
let obj = CicRefine.pack_coercion_obj obj in
let metasenv = GrafiteTypes.get_proof_metasenv status in
match obj with
| Cic.CurrentProof (_,metasenv',bo,ty,_, attrs) ->
let name = UriManager.name_of_uri uri in
if not(CicPp.check name ty) then
- HLog.error ("Bad name: " ^ name);
+ HLog.warn ("Bad name: " ^ name);
if opts.do_heavy_checks then
begin
let dbd = LibraryDb.instance () in
let t = CicUtil.term_of_uri u in
let ty',g =
CicTypeChecker.type_of_aux'
- metasenv' [] t CicUniv.empty_ugraph
+ metasenv' [] t CicUniv.oblivion_ugraph
in
fst(CicReduction.are_convertible [] ty' ty g))
similar
("Theorem already proved: " ^ UriManager.string_of_uri x ^
"\nPlease use a variant."));
end;
- let initial_proof = (Some uri, metasenv', bo, ty, attrs) in
+ let _subst = [] in
+ let initial_proof = (Some uri, metasenv', _subst, lazy bo, ty, attrs) in
let initial_stack = Continuationals.Stack.of_metasenv metasenv' in
- { status with GrafiteTypes.proof_status =
- GrafiteTypes.Incomplete_proof
- { GrafiteTypes.proof = initial_proof; stack = initial_stack } },
- []
+ status#set_proof_status
+ (GrafiteTypes.Incomplete_proof
+ { GrafiteTypes.proof = initial_proof; stack = initial_stack }),
+ `Old []
| _ ->
if metasenv <> [] then
raise (GrafiteTypes.Command_error (
"metasenv not empty while giving a definition with body: " ^
CicMetaSubst.ppmetasenv [] metasenv));
let status, lemmas = add_obj uri obj status in
- let status,new_lemmas =
- add_coercions_of_record_to_moo obj lemmas status
- in
- {status with GrafiteTypes.proof_status = GrafiteTypes.No_proof},
- uri::new_lemmas@lemmas
+ let status,new_lemmas = add_coercions_of_lemmas lemmas status in
+ status#set_proof_status GrafiteTypes.No_proof,
+ `Old (uri::new_lemmas@lemmas)
in
- match status.GrafiteTypes.proof_status with
+ match status#proof_status with
GrafiteTypes.Intermediate _ ->
- {status with GrafiteTypes.proof_status = GrafiteTypes.No_proof},uris
+ status#set_proof_status GrafiteTypes.No_proof,uris
| _ -> status,uris
} and eval_executable = {ee_go = fun ~disambiguate_tactic ~disambiguate_command
~disambiguate_macro opts status (text,prefix_len,ex) ->
match ex with
- | GrafiteAst.Tactical (_, tac, None) ->
- eval_tactical ~disambiguate_tactic status (text,prefix_len,tac),[]
- | GrafiteAst.Tactical (_, tac, Some punct) ->
+ | GrafiteAst.Tactic (_(*loc*), Some tac, punct) ->
+ let tac = apply_tactic ~disambiguate_tactic (text,prefix_len,tac) in
+ let status = eval_tactical status (tactic_of_ast' tac) in
+ (* CALL auto on every goal, easy way of testing it
+ let auto =
+ GrafiteAst.AutoBatch
+ (loc, ([],["depth","2";"timeout","1";"type","1"])) in
+ (try
+ let auto = apply_tactic ~disambiguate_tactic ("",0,auto) in
+ let _ = eval_tactical status (tactic_of_ast' auto) in
+ print_endline "GOOD"; ()
+ with ProofEngineTypes.Fail _ -> print_endline "BAD" | _ -> ());*)
+ eval_tactical status
+ (punctuation_tactical_of_ast (text,prefix_len,punct)),`Old []
+ | GrafiteAst.Tactic (_, None, punct) ->
+ eval_tactical status
+ (punctuation_tactical_of_ast (text,prefix_len,punct)),`Old []
+ | GrafiteAst.NTactic (_(*loc*), tacl) ->
+ if status#ng_mode <> `ProofMode then
+ raise (GrafiteTypes.Command_error "Not in proof mode")
+ else
+ let status =
+ List.fold_left
+ (fun status tac ->
+ let status = eval_ng_tac (text,prefix_len,tac) status in
+ subst_metasenv_and_fix_names status)
+ status tacl
+ in
+ status,`New []
+ | GrafiteAst.NonPunctuationTactical (_, tac, punct) ->
let status =
- eval_tactical ~disambiguate_tactic status (text,prefix_len,tac) in
- eval_tactical ~disambiguate_tactic status (text,prefix_len,punct),[]
+ eval_tactical status
+ (non_punctuation_tactical_of_ast (text,prefix_len,tac))
+ in
+ eval_tactical status
+ (punctuation_tactical_of_ast (text,prefix_len,punct)),`Old []
| GrafiteAst.Command (_, cmd) ->
eval_command.ec_go ~disambiguate_command opts status (text,prefix_len,cmd)
+ | GrafiteAst.NCommand (_, cmd) ->
+ eval_ncommand opts status (text,prefix_len,cmd)
| GrafiteAst.Macro (loc, macro) ->
raise (Macro (loc,disambiguate_macro status (text,prefix_len,macro)))
~disambiguate_macro:(fun _ _ -> assert false)
status ast
in
- assert (lemmas=[]);
+ assert (lemmas=`Old []);
status)
status moo
} and eval_ast = {ea_go = fun ~disambiguate_tactic ~disambiguate_command
-~disambiguate_macro ?(do_heavy_checks=false) ?(clean_baseuri=true) status
+~disambiguate_macro ?(do_heavy_checks=false) status
(text,prefix_len,st)
->
- let opts = {
- do_heavy_checks = do_heavy_checks ;
- clean_baseuri = clean_baseuri }
- in
+ let opts = { do_heavy_checks = do_heavy_checks ; } in
match st with
| GrafiteAst.Executable (_,ex) ->
eval_executable.ee_go ~disambiguate_tactic ~disambiguate_command
~disambiguate_macro opts status (text,prefix_len,ex)
- | GrafiteAst.Comment (_,c) -> eval_comment status (text,prefix_len,c),[]
+ | GrafiteAst.Comment (_,c) ->
+ eval_comment.ecm_go ~disambiguate_command opts status (text,prefix_len,c)
+} and eval_comment = { ecm_go = fun ~disambiguate_command opts status (text,prefix_len,c) ->
+ status, `Old []
}
+;;
+
let eval_ast = eval_ast.ea_go