(* $Id$ *)
-module GT = GrafiteTypes
-
open Printf
exception Drop
exception IncludedFileNotCompiled of string * string
exception Macro of
GrafiteAst.loc *
- (Cic.context -> GT.status * Cic.term GrafiteAst.macro)
+ (Cic.context -> GrafiteTypes.status * Cic.term GrafiteAst.macro)
exception ReadOnlyUri of string
type 'a disambiguator_input = string * int * 'a
end else
FreshNamesGenerator.mk_fresh_name ~subst:[] metasenv context name ~typ
-let tactic_of_ast ast =
+let tactic_of_ast status ast =
let module PET = ProofEngineTypes in
match ast with
| GrafiteAst.Absurd (_, term) -> Tactics.absurd term
| GrafiteAst.Apply (_, term) -> Tactics.apply term
- | GrafiteAst.ApplyS (_, term) ->
- Tactics.applyS ~term ~dbd:(LibraryDb.instance ())
+ | GrafiteAst.ApplyS (_, term, params) ->
+ Tactics.applyS ~term ~params ~dbd:(LibraryDb.instance ())
+ ~universe:status.GrafiteTypes.universe
| GrafiteAst.Assumption _ -> Tactics.assumption
| GrafiteAst.Auto (_,params) ->
AutoTactic.auto_tac ~params ~dbd:(LibraryDb.instance ())
+ ~universe:status.GrafiteTypes.universe
| GrafiteAst.Change (_, pattern, with_what) ->
Tactics.change ~pattern with_what
| GrafiteAst.Clear (_,id) -> Tactics.clear id
let mk_fresh_name_callback = namer_of names in
Tactics.decompose ~mk_fresh_name_callback ~dbd ~user_types ?what
| GrafiteAst.Demodulate _ -> Tactics.demodulate ~dbd:(LibraryDb.instance ())
- | GrafiteAst.Discriminate (_,term) -> Tactics.discriminate term
+ | GrafiteAst.Destruct (_,term) -> Tactics.destruct term
| GrafiteAst.Elim (_, what, using, depth, names) ->
Tactics.elim_intros ?using ?depth ~mk_fresh_name_callback:(namer_of names)
what
Tactics.generalize ~mk_fresh_name_callback:(namer_of names) pattern
| GrafiteAst.Goal (_, n) -> Tactics.set_goal n
| GrafiteAst.IdTac _ -> Tactics.id
- | GrafiteAst.Injection (_,term) -> Tactics.injection term
| GrafiteAst.Intros (_, None, names) ->
PrimitiveTactics.intros_tac ~mk_fresh_name_callback:(namer_of names) ()
| GrafiteAst.Intros (_, Some num, names) ->
| GrafiteAst.Split _
| GrafiteAst.Replace _
| GrafiteAst.Reduce _
- | GrafiteAst.Injection _
| GrafiteAst.IdTac _
| GrafiteAst.Generalize _
| GrafiteAst.Elim _
let apply_tactic ~disambiguate_tactic (text,prefix_len,tactic) (status, goal) =
(* prerr_endline "apply_tactic"; *)
-(* prerr_endline (Continuationals.Stack.pp (GT.get_stack status)); *)
- let starting_metasenv = GT.get_proof_metasenv status in
+(* 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 = GT.get_proof_metasenv status in
- let proof = GT.get_current_proof status 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 tactic = tactic_of_ast 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
proof, opened_goals
in
let incomplete_proof =
- match status.GT.proof_status with
- | GT.Incomplete_proof p -> p
+ match status.GrafiteTypes.proof_status with
+ | GrafiteTypes.Incomplete_proof p -> p
| _ -> assert false
in
- { status with GT.proof_status =
- GT.Incomplete_proof
- { incomplete_proof with GT.proof = proof } },
+ { status with GrafiteTypes.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_tactic:
- (GT.status ->
+ (GrafiteTypes.status ->
ProofEngineTypes.goal ->
(('term, 'lazy_term, 'reduction, 'ident) GrafiteAst.tactic)
disambiguator_input ->
- GT.status *
+ GrafiteTypes.status *
(Cic.term, Cic.lazy_term, Cic.lazy_term GrafiteAst.reduction, string) GrafiteAst.tactic) ->
disambiguate_command:
- (GT.status ->
- ('obj GrafiteAst.command) disambiguator_input ->
- GT.status * Cic.obj GrafiteAst.command) ->
+ (GrafiteTypes.status ->
+ (('term,'obj) GrafiteAst.command) disambiguator_input ->
+ GrafiteTypes.status * (Cic.term,Cic.obj) GrafiteAst.command) ->
disambiguate_macro:
- (GT.status ->
+ (GrafiteTypes.status ->
('term GrafiteAst.macro) disambiguator_input ->
- Cic.context -> GT.status * Cic.term GrafiteAst.macro) ->
+ Cic.context -> GrafiteTypes.status * Cic.term GrafiteAst.macro) ->
?do_heavy_checks:bool ->
?clean_baseuri:bool ->
- GT.status ->
+ GrafiteTypes.status ->
(('term, 'lazy_term, 'reduction, 'obj, 'ident) GrafiteAst.statement)
disambiguator_input ->
- GT.status * UriManager.uri list
+ GrafiteTypes.status * UriManager.uri list
}
type 'a eval_command =
{ec_go: 'term 'obj.
disambiguate_command:
- (GT.status -> ('obj GrafiteAst.command) disambiguator_input ->
- GT.status * Cic.obj GrafiteAst.command) ->
- options -> GT.status ->
- ('obj GrafiteAst.command) disambiguator_input ->
- GT.status * UriManager.uri list
+ (GrafiteTypes.status -> (('term,'obj) GrafiteAst.command) disambiguator_input ->
+ GrafiteTypes.status * (Cic.term,Cic.obj) GrafiteAst.command) ->
+ options -> GrafiteTypes.status ->
+ (('term,'obj) GrafiteAst.command) disambiguator_input ->
+ GrafiteTypes.status * UriManager.uri list
}
type 'a eval_executable =
{ee_go: 'term 'lazy_term 'reduction 'obj 'ident.
disambiguate_tactic:
- (GT.status ->
+ (GrafiteTypes.status ->
ProofEngineTypes.goal ->
(('term, 'lazy_term, 'reduction, 'ident) GrafiteAst.tactic)
disambiguator_input ->
- GT.status *
+ GrafiteTypes.status *
(Cic.term, Cic.lazy_term, Cic.lazy_term GrafiteAst.reduction, string) GrafiteAst.tactic) ->
disambiguate_command:
- (GT.status ->
- ('obj GrafiteAst.command) disambiguator_input ->
- GT.status * Cic.obj GrafiteAst.command) ->
+ (GrafiteTypes.status ->
+ (('term,'obj) GrafiteAst.command) disambiguator_input ->
+ GrafiteTypes.status * (Cic.term,Cic.obj) GrafiteAst.command) ->
disambiguate_macro:
- (GT.status ->
+ (GrafiteTypes.status ->
('term GrafiteAst.macro) disambiguator_input ->
- Cic.context -> GT.status * Cic.term GrafiteAst.macro) ->
+ Cic.context -> GrafiteTypes.status * Cic.term GrafiteAst.macro) ->
options ->
- GT.status ->
+ GrafiteTypes.status ->
(('term, 'lazy_term, 'reduction, 'obj, 'ident) GrafiteAst.code) disambiguator_input ->
- GT.status * UriManager.uri list
+ GrafiteTypes.status * UriManager.uri list
}
type 'a eval_from_moo =
- { efm_go: GT.status -> string -> GT.status }
+ { efm_go: GrafiteTypes.status -> string -> GrafiteTypes.status }
-let coercion_moo_statement_of uri =
- GrafiteAst.Coercion (HExtlib.dummy_floc, uri, false)
+let coercion_moo_statement_of arity uri =
+ GrafiteAst.Coercion (HExtlib.dummy_floc, uri, false, arity)
let refinement_toolkit = {
RefinementTool.type_of_aux' =
RefinementTool.pack_coercion_obj = CicRefine.pack_coercion_obj;
}
-let eval_coercion status ~add_composites uri =
+let eval_coercion status ~add_composites uri arity =
let status,compounds =
- GrafiteSync.add_coercion ~add_composites refinement_toolkit status uri in
+ GrafiteSync.add_coercion ~add_composites refinement_toolkit status uri arity
+ in
let moo_content =
- List.map coercion_moo_statement_of (uri::compounds)
+ List.map (coercion_moo_statement_of arity) (uri::compounds)
in
- let status = GT.add_moo_content moo_content status in
- {status with GT.proof_status = GT.No_proof},
+ let status = GrafiteTypes.add_moo_content moo_content status in
+ {status with GrafiteTypes.proof_status = GrafiteTypes.No_proof},
compounds
let eval_tactical ~disambiguate_tactic status tac =
let apply_tactic = apply_tactic ~disambiguate_tactic in
let module MatitaStatus =
struct
- type input_status = GT.status * ProofEngineTypes.goal
+ type input_status = GrafiteTypes.status * ProofEngineTypes.goal
type output_status =
- GT.status * ProofEngineTypes.goal list * ProofEngineTypes.goal list
+ GrafiteTypes.status * ProofEngineTypes.goal list * ProofEngineTypes.goal list
type tactic = input_status -> output_status
let apply_tactic tac = tac
let goals (_, opened, closed) = opened, closed
let set_goals (opened, closed) (status, _, _) = (status, opened, closed)
- let get_stack (status, _) = GT.get_stack status
+ let get_stack (status, _) = GrafiteTypes.get_stack status
let get_status (status, goal) =
- match status.GT.proof_status with
- | GT.Incomplete_proof incomplete -> incomplete.GT.proof, goal
+ match status.GrafiteTypes.proof_status with
+ | GrafiteTypes.Incomplete_proof incomplete -> incomplete.GrafiteTypes.proof, goal
| _ -> assert false
let get_proof (status, _, _) =
- match status.GT.proof_status with
- | GT.Incomplete_proof incomplete -> incomplete.GT.proof
+ match status.GrafiteTypes.proof_status with
+ | GrafiteTypes.Incomplete_proof incomplete -> incomplete.GrafiteTypes.proof
| _ -> assert false
let set_stack stack (status, opened, closed) =
- GT.set_stack stack status, opened, closed
+ GrafiteTypes.set_stack stack status, opened, closed
let inject (status, _) = (status, [], [])
let focus goal (status, _, _) = (status, goal)
in
let status, _, _ = tactical_of_ast 0 tac (status, ~-1) in
let status = (* is proof completed? *)
- match status.GT.proof_status with
- | GT.Incomplete_proof
- { GT.stack = stack; proof = proof }
+ match status.GrafiteTypes.proof_status with
+ | GrafiteTypes.Incomplete_proof
+ { GrafiteTypes.stack = stack; proof = proof }
when Continuationals.Stack.is_empty stack ->
- { status with GT.proof_status = GT.Proof proof }
+ { status with GrafiteTypes.proof_status = GrafiteTypes.Proof proof }
| _ -> status
in
status
let obj,_ =
CicEnvironment.get_cooked_obj CicUniv.empty_ugraph uri in
let attrs = CicUtil.attributes_of_obj obj in
- List.mem (`Class `Coercion) attrs
+ 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
let wanted_coercions =
HExtlib.filter_map
(function
- | (name,true) ->
+ | (name,true,arity) ->
Some
- (UriManager.uri_of_string
- (GT.qualify status name ^ ".con"))
+ (arity, UriManager.uri_of_string
+ (GrafiteTypes.qualify status name ^ ".con"))
| _ -> None)
fields
in
List.split
(HExtlib.filter_map
(fun uri ->
- let is_a_wanted_coercion =
- List.exists (UriManager.eq uri) wanted_coercions
+ 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
- if is_a_coercion uri || is_a_wanted_coercion then
- Some (uri, coercion_moo_statement_of uri)
+ let is_a_coercion, arity_coercion = is_a_coercion uri in
+ if is_a_coercion then
+ Some (uri, coercion_moo_statement_of arity_coercion uri)
+ else if is_a_wanted_coercion then
+ Some (uri, coercion_moo_statement_of arity_wanted uri)
else
- None)
+ None)
lemmas)
in
(*prerr_endline "actual coercions:";
List.iter
(fun u -> prerr_endline (UriManager.string_of_uri u))
lemmas; *)
- let status = GT.add_moo_content moo_content status in
+ let status = GrafiteTypes.add_moo_content moo_content status in
{status with
- GT.coercions = coercions @ status.GT.coercions},
+ GrafiteTypes.coercions = coercions @ status.GrafiteTypes.coercions},
lemmas
let add_obj uri obj status =
let status,cmd = disambiguate_command status (text,prefix_len,cmd) in
let status,uris =
match cmd with
- | GrafiteAst.Print (_,"proofterm") ->
- let _,_,p,_ = GT.get_current_proof status in
- print_endline (AutoTactic.pp_proofterm p);
- status,[]
- | GrafiteAst.Print (_,_) -> status,[]
+ | 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
+(* debug
+ let msg =
+ let candidates = Universe.get_candidates status.GrafiteTypes.universe key in
+ ("candidates for " ^ (CicPp.ppterm key) ^ " = " ^
+ (String.concat "\n" (List.map CicPp.ppterm candidates)))
+ 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
| GrafiteAst.Default (loc, what, uris) as cmd ->
LibraryObjects.set_default what uris;
- GT.add_moo_content [cmd] status,[]
+ GrafiteTypes.add_moo_content [cmd] status,[]
+ | GrafiteAst.Drop loc -> raise Drop
| GrafiteAst.Include (loc, baseuri) ->
let moopath_rw, moopath_r =
LibraryMisc.obj_file_of_baseuri
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)))
+ in
+ prerr_endline msg;
+*)
status,[]
+ | GrafiteAst.Print (_,"proofterm") ->
+ let _,_,p,_ = GrafiteTypes.get_current_proof status in
+ print_endline (AutoTactic.pp_proofterm p);
+ status,[]
+ | GrafiteAst.Print (_,_) -> status,[]
+ | GrafiteAst.Qed loc ->
+ let uri, metasenv, bo, ty =
+ match status.GrafiteTypes.proof_status with
+ | GrafiteTypes.Proof (Some uri, metasenv, body, ty) ->
+ uri, metasenv, body, ty
+ | GrafiteTypes.Proof (None, metasenv, body, ty) ->
+ raise (GrafiteTypes.Command_error
+ ("Someone allows to start a theorem without giving the "^
+ "name/uri. This should be fixed!"))
+ | _->
+ raise
+ (GrafiteTypes.Command_error "You can't Qed an incomplete theorem")
+ in
+ if metasenv <> [] then
+ raise
+ (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,[],[]) in
+ let status, lemmas = add_obj uri obj status in
+ {status with
+ GrafiteTypes.proof_status = GrafiteTypes.No_proof},
+ 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 ' ');
- GT.command_error "baseuri can't contain spaces"
+ GrafiteTypes.command_error "baseuri can't contain spaces"
with Not_found -> v
in
if Http_getter_storage.is_read_only value then begin
(Filename.dirname (Http_getter.filename ~writable:true (value ^
"/foo.con")));
end;
- GT.set_option status name value,[]
- | GrafiteAst.Drop loc -> raise Drop
- | GrafiteAst.Qed loc ->
- let uri, metasenv, bo, ty =
- match status.GT.proof_status with
- | GT.Proof (Some uri, metasenv, body, ty) ->
- uri, metasenv, body, ty
- | GT.Proof (None, metasenv, body, ty) ->
- raise (GT.Command_error
- ("Someone allows to start a theorem without giving the "^
- "name/uri. This should be fixed!"))
- | _->
- raise
- (GT.Command_error "You can't Qed an incomplete theorem")
- in
- if metasenv <> [] then
- raise
- (GT.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,[],[]) in
- let status, lemmas = add_obj uri obj status in
- {status with GT.proof_status = GT.No_proof},
- uri::lemmas
- | GrafiteAst.Coercion (loc, uri, add_composites) ->
- eval_coercion status ~add_composites uri
+ GrafiteTypes.set_option status name value,[]
| GrafiteAst.Obj (loc,obj) ->
let ext,name =
match obj with
(match types with (name,_,_,_)::_ -> name | _ -> assert false)
| _ -> assert false in
let uri =
- UriManager.uri_of_string (GT.qualify status name ^ ext) in
+ UriManager.uri_of_string (GrafiteTypes.qualify status name ^ ext) in
let obj = CicRefine.pack_coercion_obj obj in
- let metasenv = GT.get_proof_metasenv status in
+ let metasenv = GrafiteTypes.get_proof_metasenv status in
match obj with
| Cic.CurrentProof (_,metasenv',bo,ty,_,_) ->
let name = UriManager.name_of_uri uri in
end;
let initial_proof = (Some uri, metasenv', bo, ty) in
let initial_stack = Continuationals.Stack.of_metasenv metasenv' in
- { status with GT.proof_status =
- GT.Incomplete_proof
- { GT.proof = initial_proof; stack = initial_stack } },
+ { status with GrafiteTypes.proof_status =
+ GrafiteTypes.Incomplete_proof
+ { GrafiteTypes.proof = initial_proof; stack = initial_stack } },
[]
| _ ->
if metasenv <> [] then
- raise (GT.Command_error (
+ 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 GT.proof_status = GT.No_proof},
+ {status with GrafiteTypes.proof_status = GrafiteTypes.No_proof},
uri::new_lemmas@lemmas
in
- match status.GT.proof_status with
- GT.Intermediate _ ->
- {status with GT.proof_status = GT.No_proof},uris
+ match status.GrafiteTypes.proof_status with
+ GrafiteTypes.Intermediate _ ->
+ {status with GrafiteTypes.proof_status = GrafiteTypes.No_proof},uris
| _ -> status,uris
} and eval_executable = {ee_go = fun ~disambiguate_tactic ~disambiguate_command
projects / helm.git / blobdiff