UriManager.uri_of_string (sprintf "%s/%s" BuildTimeConf.base_uri name)
*)
-let baseuri = ref "cic:/matita"
+let baseuri = lazy (ref ("cic:/matita/" ^ Helm_registry.get "matita.owner"))
+let basedir = lazy (ref (Helm_registry.get "matita.basedir"))
+
let qualify name =
- let baseuri = !baseuri in
+ let baseuri = !(Lazy.force baseuri) in
if baseuri.[String.length baseuri - 1] = '/' then
baseuri ^ name
else
String.concat "/" [baseuri; name]
let split_obj = function
- | Cic.Constant (name, body, ty, _)
- | Cic.Variable (name, body, ty, _) -> (name, body, ty)
+ | Cic.Constant (name, body, ty, _, attrs)
+ | Cic.Variable (name, body, ty, _, attrs) -> (name, body, ty, attrs)
| _ -> assert false
-let canonical_context metano metasenv =
- try
- let (_, context, _) = List.find (fun (m, _, _) -> m = metano) metasenv in
- context
- with Not_found ->
- failwith (sprintf "Can't find canonical context for %d" metano)
-
-let get_context_and_metasenv (currentProof:MatitaTypes.currentProof) =
- if currentProof#onGoing () then
- let proof = currentProof#proof in
- let metasenv = proof#metasenv in
- let goal = proof#goal in
- (canonical_context goal metasenv, metasenv)
- else
- ([], [])
-
- (** term AST -> Cic.term. Uses disambiguator and change imperatively the
- * metasenv as needed *)
-let disambiguate ~(disambiguator:MatitaTypes.disambiguator) ~currentProof ast =
- if currentProof#onGoing () then begin
- let proof = currentProof#proof in
- let metasenv = proof#metasenv in
- let goal = proof#goal in
- let context = canonical_context goal metasenv in
- let (_, metasenv, term,ugraph) as retval =
- disambiguator#disambiguateTermAst ~context ~metasenv ast
- in
- proof#set_metasenv metasenv;
- retval
- end else
- disambiguator#disambiguateTermAst ast
-
class virtual interpreterState =
(* static values, shared by all states inheriting this class *)
let loc = ref None in
- let history = ref [] in
- fun ~(console: MatitaTypes.console) ->
+ let last_item = ref None in
+ let evalAstCallback = ref None in
+ fun ~(console: #MatitaTypes.console) ->
object (self)
+ val dbd = MatitaMisc.dbd_instance ()
+ val currentProof = MatitaProof.instance ()
+ val disambiguator = MatitaDisambiguator.instance ()
+
(** eval a toplevel phrase in the current state and return the new state
*)
method parsePhrase s =
- match CicTextualParser2.parse_tactical s with
+ match disambiguator#parserr#parseTactical s with
| (TacticAst.LocatedTactical (loc', tac)) as tactical ->
loc := Some loc';
- (match tac with (* update interpreter history *)
- | TacticAst.Command (TacticAst.Qed None) ->
- history := `Qed :: !history
- | TacticAst.Command (TacticAst.Theorem (_, Some name, _, None)) ->
- history := `Theorem name :: !history
- | TacticAst.Command (TacticAst.Qed _)
- | TacticAst.Command (TacticAst.Theorem _) -> assert false
- | _ -> history := `Tactic :: !history);
tactical
| _ -> assert false
method virtual evalTactical:
(CicAst.term, string) TacticAst.tactical -> outcome
+ method private _evalTactical ast =
+ self#setLastItem None;
+ let res = self#evalTactical ast in
+ (match !evalAstCallback with Some f -> f ast | None -> ());
+ res
+
method evalPhrase s =
- debug_print (sprintf "evaluating '%s'" s);
- self#evalTactical (self#parsePhrase (Stream.of_string s))
+ self#_evalTactical (self#parsePhrase (Stream.of_string s))
- method evalAst ast = self#evalTactical ast
+ method evalAst ast = self#_evalTactical ast
method endOffset =
match !loc with
| Some (start_pos, end_pos) -> end_pos.Lexing.pos_cnum
| None -> failwith "MatitaInterpreter: no offset recorded"
+ method lastItem: script_item option = !last_item
+ method private setLastItem item = last_item := item
+
+ method setEvalAstCallback f = evalAstCallback := Some f
+
end
(** Implements phrases that should be accepted in all states *)
class sharedState
- ~(disambiguator: MatitaTypes.disambiguator)
- ~(currentProof: MatitaTypes.currentProof)
- ~(console: MatitaTypes.console)
+ ~(console: #MatitaTypes.console)
?(mathViewer: MatitaTypes.mathViewer option)
- ~(dbd: Mysql.dbd)
()
=
object (self)
(* do nothing, just for compatibility with coq syntax *)
New_state Command
| TacticAst.Command (TacticAst.Baseuri (Some uri)) ->
- baseuri := uri;
+ Lazy.force baseuri := uri;
console#echo_message (sprintf "base uri set to \"%s\"" uri);
Quiet
| TacticAst.Command (TacticAst.Baseuri None) ->
- console#echo_message (sprintf "base uri is \"%s\"" !baseuri);
+ console#echo_message (sprintf "base uri is \"%s\""
+ !(Lazy.force baseuri));
+ Quiet
+ | TacticAst.Command (TacticAst.Basedir (Some path)) ->
+ Lazy.force basedir := path;
+ console#echo_message (sprintf "base dir set to \"%s\"" path);
+ Quiet
+ | TacticAst.Command (TacticAst.Basedir None) ->
+ console#echo_message (sprintf "base dir is \"%s\""
+ !(Lazy.force basedir));
Quiet
| TacticAst.Command (TacticAst.Check term) ->
- let (_, _, term,ugraph) =
- disambiguate ~disambiguator ~currentProof term
+ let (_, metasenv, term,ugraph) =
+ MatitaCicMisc.disambiguate ~disambiguator ~currentProof term
in
- let (context, metasenv) = get_context_and_metasenv currentProof in
+ let (context, _) =
+ MatitaCicMisc.get_context_and_metasenv currentProof
+ in
+(* this is the Eval Compute
+ let term = CicReduction.whd context term in
+*)
let dummyno = CicMkImplicit.new_meta metasenv [] in
let ty,ugraph1 =
CicTypeChecker.type_of_aux' metasenv context term ugraph
in
(* TASSI: here ugraph1 is unused.... FIXME *)
let expr = Cic.Cast (term, ty) in
- let sequent = (dummyno, context, expr) in
(match mathViewer with
- | None -> ()
- | Some v -> v#checkTerm sequent metasenv);
+ | Some v -> v#checkTerm (`Cic (expr, metasenv))
+ | _ -> ());
Quiet
| TacticAst.Command (TacticAst.Search_pat (search_kind, pat)) ->
let uris =
in
(* TODO ZACK: show URIs to the user *)
Quiet
+ | TacticAst.Command (TacticAst.Print `Env) ->
+ let uris = CicEnvironment.list_uri () in
+ console#echo_message "Environment:";
+ List.iter (fun u ->
+ console#echo_message (" " ^ (UriManager.string_of_uri u))
+ ) uris;
+ Quiet
+ | TacticAst.Command (TacticAst.Print `Coer) ->
+ let uris = CoercGraph.get_coercions_list () in
+ console#echo_message "Coercions:";
+ List.iter (fun (s,t,u) ->
+ console#echo_message (" " ^ (UriManager.string_of_uri u))
+ ) uris;
+ Quiet
| tactical ->
raise (Command_error (TacticAstPp.pp_tactical tactical))
end
[] indTypes
in
let cicIndTypes = List.rev cicIndTypes in
-(*
- prerr_endline uri;
- pp_indtypes cicIndTypes;
-*)
(UriManager.uri_of_string uri, (cicIndTypes, [], paramsno))
- (* TODO Zack a lot more to be done here:
- * - save object to disk in xml format
- * - register uri to the getter
+let save_object_to_disk uri obj =
+ let ensure_path_exists path =
+ let dir = Filename.dirname path in
+ try
+ let stats = Unix.stat dir in
+ if stats.Unix.st_kind <> Unix.S_DIR then
+ raise (Failure (dir ^ " already exists and is not a directory"))
+ else
+ ()
+ with
+ Unix.Unix_error (_,_,_) ->
+ let pstatus = Unix.system ("mkdir -p " ^ dir) in
+ match pstatus with
+ | Unix.WEXITED n when n = 0 -> ()
+ | _ -> raise (Failure ("Unable to create " ^ dir))
+ in
+ (* generate annobj, ids_to_inner_sorts and ids_to_inner_types *)
+ let annobj,_,_,ids_to_inner_sorts,ids_to_inner_types,_,_ =
+ Cic2acic.acic_object_of_cic_object ~eta_fix:false obj
+ in
+ (* prepare XML *)
+ let xml, bodyxml =
+ Cic2Xml.print_object uri ~ids_to_inner_sorts ~ask_dtd_to_the_getter:false
+ annobj
+ in
+ let xmlinnertypes =
+ Cic2Xml.print_inner_types uri ~ids_to_inner_sorts ~ids_to_inner_types
+ ~ask_dtd_to_the_getter:false
+ in
+ (* prepare URIs and paths *)
+ let innertypesuri = UriManager.innertypesuri_of_uri uri in
+ let bodyuri = UriManager.bodyuri_of_uri uri in
+ let innertypesfilename = Str.replace_first (Str.regexp "^cic:") ""
+ (UriManager.string_of_uri innertypesuri) ^ ".xml.gz" in
+ let innertypespath = !(Lazy.force basedir) ^ "/" ^ innertypesfilename in
+ let xmlfilename = Str.replace_first (Str.regexp "^cic:/") ""
+ (UriManager.string_of_uri uri) ^ ".xml.gz" in
+ let xmlpath = !(Lazy.force basedir) ^ "/" ^ xmlfilename in
+ let xmlbodyfilename = Str.replace_first (Str.regexp "^cic:/") ""
+ (UriManager.string_of_uri uri) ^ ".body.xml.gz" in
+ let xmlbodypath = !(Lazy.force basedir) ^ "/" ^ xmlbodyfilename in
+ let path_scheme_of path = "file://" ^ path in
+ MatitaMisc.mkdirs (List.map Filename.dirname [innertypespath; xmlpath]);
+ (* now write to disk *)
+ ensure_path_exists innertypespath;
+ Xml.pp ~gzip:true xmlinnertypes (Some innertypespath) ;
+ ensure_path_exists xmlpath;
+ Xml.pp ~gzip:true xml (Some xmlpath) ;
+
+ (* now register to the getter *)
+ Http_getter.register' innertypesuri (path_scheme_of innertypespath);
+ Http_getter.register' uri (path_scheme_of xmlpath);
+ (* now the optional body, both write and register *)
+ (match bodyxml,bodyuri with
+ None,None -> ()
+ | Some bodyxml,Some bodyuri->
+ ensure_path_exists xmlbodypath;
+ Xml.pp ~gzip:true bodyxml (Some xmlbodypath) ;
+ Http_getter.register' bodyuri (path_scheme_of xmlbodypath)
+ | _-> assert false)
+
+ (* TODO ZACK a lot more to be done here:
* - save universe file *)
-let add_constant_to_world ~dbd ~uri ?body ~ty ~ugraph () =
- let name = UriManager.name_of_uri uri in
- let obj = Cic.Constant (name, body, ty, []) in
- let ugraph = CicUnivUtils.clean_and_fill uri obj ugraph in
- CicEnvironment.add_type_checked_term uri (obj, ugraph);
- MetadataDb.index_constant ~dbd
- ~owner:(Helm_registry.get "matita.owner") ~uri ~body ~ty
+let add_constant_to_world ~(console: #MatitaTypes.console)
+ ~dbd ~uri ?body ~ty ?(params = []) ?(attrs = []) ~ugraph ()
+=
+ let suri = UriManager.string_of_uri uri in
+ if CicEnvironment.in_library uri then
+ error (sprintf "%s constant already defined" suri)
+ else begin
+ let name = UriManager.name_of_uri uri in
+ let obj = Cic.Constant (name, body, ty, params, attrs) in
+ let ugraph = CicUnivUtils.clean_and_fill uri obj ugraph in
+ CicEnvironment.add_type_checked_term uri (obj, ugraph);
+ MetadataDb.index_constant ~dbd ~uri ~body ~ty;
+ save_object_to_disk uri obj;
+ console#echo_message (sprintf "%s constant defined" suri)
+ end
- (** Implements phrases that should be accepted only in Command state *)
-class commandState
- ~(disambiguator: MatitaTypes.disambiguator)
- ~(currentProof: MatitaTypes.currentProof)
- ~(console: MatitaTypes.console)
- ?mathViewer
- ~(dbd: Mysql.dbd)
- ()
+let add_inductive_def_to_world ~(console: #MatitaTypes.console)
+ ~dbd ~uri ~indTypes ?(params = []) ?(leftno = 0) ?(attrs = []) ~ugraph ()
=
- let shared =
- new sharedState ~disambiguator ~currentProof ~console ?mathViewer ~dbd ()
- in
+ let suri = UriManager.string_of_uri uri in
+ if CicEnvironment.in_library uri then
+ error (sprintf "%s inductive type already defined" suri)
+ else begin
+ let name = UriManager.name_of_uri uri in
+ let obj = Cic.InductiveDefinition (indTypes, params, leftno, attrs) in
+ let ugraph = CicUnivUtils.clean_and_fill uri obj ugraph in
+ CicEnvironment.put_inductive_definition uri (obj, ugraph);
+ MetadataDb.index_inductive_def ~dbd ~uri ~types:indTypes;
+ save_object_to_disk uri obj;
+ console#echo_message (sprintf "%s inductive type defined" suri);
+ let elim sort =
+ try
+ let obj = CicElim.elim_of ~sort uri 0 in
+ let (name, body, ty, attrs) = split_obj obj in
+ let suri = qualify name ^ ".con" in
+ let uri = UriManager.uri_of_string suri in
+ (* TODO Zack: make CicElim returns a universe *)
+ let ugraph = CicUniv.empty_ugraph in
+ add_constant_to_world ~console ~dbd ~uri ?body ~ty ~attrs ~ugraph ();
+(*
+ console#echo_message
+ (sprintf "%s eliminator (automatically) defined" suri)
+*)
+ with CicElim.Can_t_eliminate -> ()
+ in
+ List.iter elim [ Cic.Prop; Cic.Set; (Cic.Type (CicUniv.fresh ())) ];
+ end
+
+ (** Implements phrases that should be accepted only in Command state *)
+class commandState ~(console: #MatitaTypes.console) ?mathViewer () =
+ let shared = new sharedState ~console ?mathViewer () in
object (self)
inherit interpreterState ~console
let uri = UriManager.uri_of_string (qualify name ^ ".con") in
let proof = MatitaProof.proof ~typ:expr ~uri ~metasenv () in
currentProof#start proof;
+ self#setLastItem (Some `Theorem);
New_state Proof
| TacticAst.Command
(TacticAst.Theorem (_, Some name, type_ast, Some body_ast)) ->
in
let body = CicMetaSubst.apply_subst subst body_cic in
let ty = CicMetaSubst.apply_subst subst type_cic in
- add_constant_to_world ~dbd ~uri ~body ~ty ~ugraph ();
+ add_constant_to_world ~console ~dbd ~uri ~body ~ty ~ugraph ();
+ self#setLastItem (Some (`Def uri));
Quiet
| TacticAst.Command (TacticAst.Inductive (params, indTypes)) ->
+
let (uri, (indTypes, params, leftno)) =
inddef_of_ast params indTypes disambiguator
in
- let obj = Cic.InductiveDefinition (indTypes, params, leftno) in
+ let obj = Cic.InductiveDefinition (indTypes, params, leftno, []) in
let ugraph =
CicTypeChecker.typecheck_mutual_inductive_defs uri
(indTypes, params, leftno) CicUniv.empty_ugraph
- in
- let ugraph = CicUnivUtils.clean_and_fill uri obj ugraph in
- CicEnvironment.put_inductive_definition uri (obj, ugraph);
- MetadataDb.index_inductive_def ~dbd
- ~owner:(Helm_registry.get "matita.owner") ~uri ~types:indTypes;
- let msgs = ref [] in
- let elim sort =
- try
- let obj = CicElim.elim_of ~sort uri 0 in
- let (name, body, ty) = split_obj obj in
- let uri = UriManager.uri_of_string (qualify name ^ ".con") in
- (* TODO Zack: make CicElim returns a universe *)
- let ugraph = CicUniv.empty_ugraph in
- add_constant_to_world ~dbd ~uri ?body ~ty ~ugraph ();
- msgs := (sprintf "%s defined" name) :: !msgs;
- with CicElim.Can_t_eliminate -> ()
in
- List.iter elim [ Cic.Prop; Cic.Set; (Cic.Type (CicUniv.fresh ())) ];
- Echo (String.concat "\n" (List.rev !msgs))
+ add_inductive_def_to_world ~console
+ ~dbd ~uri ~indTypes ~params ~leftno ~ugraph ();
+ self#setLastItem (Some (`Inductive uri));
+ Quiet
| TacticAst.Command TacticAst.Quit ->
currentProof#quit ();
New_state Command (* dummy answer, useless *)
| TacticAst.Command TacticAst.Proof ->
(* do nothing, just for compatibility with coq syntax *)
New_state Command
+ | TacticAst.Command (TacticAst.Coercion c_ast) ->
+ let env, metasenv, coercion, ugraph =
+ disambiguator#disambiguateTermAst c_ast
+ in
+ let coer_uri,coer_ty =
+ match coercion with
+ | Cic.Const (uri,_)
+ | Cic.Var (uri,_) ->
+ let o,_ =
+ CicEnvironment.get_obj CicUniv.empty_ugraph uri
+ in
+ (match o with
+ | Cic.Constant (_,_,ty,_,_)
+ | Cic.Variable (_,_,ty,_,_) ->
+ uri,ty
+ | _ -> assert false)
+ | Cic.MutConstruct (uri,t,c,_) ->
+ let o,_ =
+ CicEnvironment.get_obj CicUniv.empty_ugraph uri
+ in
+ (match o with
+ | Cic.InductiveDefinition (l,_,_,_) ->
+ let (_,_,_,cl) = List.nth l t in
+ let (_,cty) = List.nth cl c in
+ uri,cty
+ | _ -> assert false)
+ | _ -> assert false
+ in
+ (* we have to get the source and the tgt type uri
+ * in Coq syntax we have already their names, but
+ * since we don't support Funclass and similar I think
+ * all the coercion should be of the form
+ * (A:?)(B:?)T1->T2
+ * So we should be able to extract them from the coercion type
+ *)
+ let extract_last_two_p ty =
+ let rec aux = function
+ | Cic.Prod( _, src, Cic.Prod (n,t1,t2)) -> aux (Cic.Prod(n,t1,t2))
+ | Cic.Prod( _, src, tgt) -> src, tgt
+ | _ -> assert false
+ in
+ aux ty
+ in
+ let rec uri_of_term = function
+ | Cic.Const(u,_) -> u
+ | Cic.MutInd (u, i , _) ->
+ (* we have to build by hand the #xpointer *)
+ let base = UriManager.string_of_uri u in
+ let xp = "#xpointer(1/" ^ (string_of_int (i+1)) ^ ")" in
+ UriManager.uri_of_string (base ^ xp)
+ | Cic.Appl (he::_) -> uri_of_term he
+ | t ->
+ error ("can't extract uri from " ^ (CicPp.ppterm t));
+ assert false
+ in
+ let ty_src,ty_tgt = extract_last_two_p coer_ty in
+ let src_uri = uri_of_term ty_src in
+ let tgt_uri = uri_of_term ty_tgt in
+ let coercions_to_add =
+ CoercGraph.close_coercion_graph src_uri tgt_uri coer_uri
+ in
+ (* FIXME: we should chek it this object can be a coercion
+ * maybe add the check to extract_last_two_p
+ *)
+ console#echo_message (sprintf "Coercion %s"
+ (UriManager.string_of_uri coer_uri));
+ List.iter (fun (uri,obj,ugraph) ->
+ (*
+ console#echo_message
+ (sprintf "Coercion (automatic) %s"
+ (UriManager.string_of_uri uri));
+ *)
+ let (name, body, ty, attrs) = split_obj obj in
+ add_constant_to_world ~console
+ ~dbd ~uri ?body ~ty ~attrs ~ugraph ();
+ ) coercions_to_add;
+ Quiet
| tactical -> shared#evalTactical tactical
end
(** Implements phrases that should be accepted only in Proof state, basically
* tacticals *)
-class proofState
- ~(disambiguator: MatitaTypes.disambiguator)
- ~(currentProof: MatitaTypes.currentProof)
- ~(console: MatitaTypes.console)
- ?mathViewer
- ~(dbd: Mysql.dbd)
- ()
-=
- let disambiguate ast =
- let (_, _, term, _) = disambiguate ~disambiguator ~currentProof ast in
- term
- in
- (** tactic AST -> ProofEngineTypes.tactic *)
- let rec lookup_tactic = function
- | TacticAst.LocatedTactic (_, tactic) -> lookup_tactic tactic
- | TacticAst.Intros (_, names) -> (* TODO Zack implement intros length *)
- PrimitiveTactics.intros_tac ~mk_fresh_name_callback:(namer_of names) ()
- | TacticAst.Reflexivity -> Tactics.reflexivity
- | TacticAst.Assumption -> Tactics.assumption
- | TacticAst.Contradiction -> Tactics.contradiction
- | TacticAst.Exists -> Tactics.exists
- | TacticAst.Fourier -> Tactics.fourier
- | TacticAst.Left -> Tactics.left
- | TacticAst.Right -> Tactics.right
- | TacticAst.Ring -> Tactics.ring
- | TacticAst.Split -> Tactics.split
- | TacticAst.Symmetry -> Tactics.symmetry
- | TacticAst.Transitivity term -> Tactics.transitivity (disambiguate term)
- | TacticAst.Apply term -> Tactics.apply (disambiguate term)
- | TacticAst.Absurd term -> Tactics.absurd (disambiguate term)
- | TacticAst.Exact term -> Tactics.exact (disambiguate term)
- | TacticAst.Cut term -> Tactics.cut (disambiguate term)
- | TacticAst.Elim (term, _) -> (* TODO Zack implement "using" argument *)
- Tactics.elim_intros_simpl (disambiguate term)
- | TacticAst.ElimType term -> Tactics.elim_type (disambiguate term)
- | TacticAst.Replace (what, with_what) ->
- Tactics.replace ~what:(disambiguate what)
- ~with_what:(disambiguate with_what)
- | TacticAst.Auto -> Tactics.auto_new ~dbd
- (*
- (* TODO Zack a lot more of tactics to be implemented here ... *)
- | TacticAst.Change of 'term * 'term * 'ident option
- | TacticAst.Change_pattern of 'term pattern * 'term * 'ident option
- | TacticAst.Decompose of 'ident * 'ident list
- | TacticAst.Discriminate of 'ident
- | TacticAst.Fold of reduction_kind * 'term
- | TacticAst.Injection of 'ident
- | TacticAst.LetIn of 'term * 'ident
- | TacticAst.Reduce of reduction_kind * 'term pattern * 'ident option
- | TacticAst.Replace_pattern of 'term pattern * 'term
- | TacticAst.Rewrite of direction * 'term * 'ident option
- *)
- | _ ->
- MatitaTypes.not_implemented "some tactic"
- in
- let shared = new sharedState ~disambiguator ~currentProof ~console ~dbd () in
+class proofState ~(console: #MatitaTypes.console) ?mathViewer () =
+ let shared = new sharedState ~console ?mathViewer () in
object (self)
inherit interpreterState ~console
+ method private disambiguate ast =
+ let (_, _, term, _) =
+ MatitaCicMisc.disambiguate ~disambiguator ~currentProof ast
+ in
+ term
+
+ (** tactic AST -> ProofEngineTypes.tactic *)
+ method private lookup_tactic = function
+ | TacticAst.LocatedTactic (_, tactic) -> self#lookup_tactic tactic
+ | TacticAst.Intros (_, names) -> (* TODO Zack implement intros length *)
+ PrimitiveTactics.intros_tac ~mk_fresh_name_callback:(namer_of names)
+ ()
+ | TacticAst.Reflexivity -> Tactics.reflexivity
+ | TacticAst.Assumption -> Tactics.assumption
+ | TacticAst.Contradiction -> Tactics.contradiction
+ | TacticAst.Exists -> Tactics.exists
+ | TacticAst.Fourier -> Tactics.fourier
+ | TacticAst.Left -> Tactics.left
+ | TacticAst.Right -> Tactics.right
+ | TacticAst.Ring -> Tactics.ring
+ | TacticAst.Split -> Tactics.split
+ | TacticAst.Symmetry -> Tactics.symmetry
+ | TacticAst.Transitivity term ->
+ Tactics.transitivity (self#disambiguate term)
+ | TacticAst.Apply term -> Tactics.apply (self#disambiguate term)
+ | TacticAst.Absurd term -> Tactics.absurd (self#disambiguate term)
+ | TacticAst.Exact term -> Tactics.exact (self#disambiguate term)
+ | TacticAst.Cut term -> Tactics.cut (self#disambiguate term)
+ | TacticAst.Elim (term, _) -> (* TODO Zack implement "using" argument *)
+ Tactics.elim_intros_simpl (self#disambiguate term)
+ | TacticAst.ElimType term -> Tactics.elim_type (self#disambiguate term)
+ | TacticAst.Replace (what, with_what) ->
+ Tactics.replace ~what:(self#disambiguate what)
+ ~with_what:(self#disambiguate with_what)
+ | TacticAst.Auto -> Tactics.auto_new ~dbd
+ | TacticAst.Hint ->
+ let l = List.map fst
+ (MetadataQuery.experimental_hint ~dbd
+ (currentProof#proof#proof,currentProof#proof#goal))
+ in
+ let u = console#choose_uri l in
+ Tactics.apply (CicUtil.term_of_uri u)
+ | TacticAst.Change (what, with_what, _) ->
+ let what = self#disambiguate what in
+ let with_what = self#disambiguate with_what in
+ 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.LetIn of 'term * 'ident
+ | TacticAst.Reduce of reduction_kind * 'term pattern * 'ident option
+ | TacticAst.Replace_pattern of 'term pattern * 'term
+ | TacticAst.Rewrite of direction * 'term * 'ident option
+ *)
+ | _ -> MatitaTypes.not_implemented "some tactic"
+
method evalTactical = function
| TacticAst.LocatedTactical (_, tactical) -> self#evalTactical tactical
| TacticAst.Command TacticAst.Abort ->
let proof = currentProof#proof in
let (uri, metasenv, bo, ty) = proof#proof in
let uri = MatitaTypes.unopt_uri uri in
+ let suri = UriManager.string_of_uri uri in
(* TODO Zack this function probably should not simply fail with
* Failure, but rather raise some more meaningful exception *)
if metasenv <> [] then failwith "Proof not completed";
CicReduction.are_convertible [] proved_ty ty ugraph
in
if not b then failwith "Wrong proof";
- add_constant_to_world ~dbd ~uri ~body:bo ~ty ~ugraph ();
+ add_constant_to_world ~console ~dbd ~uri ~body:bo ~ty ~ugraph ();
currentProof#abort ();
- (match mathViewer with None -> () | Some v -> v#unload ());
+ console#echo_message (sprintf "%s defined" suri);
+ self#setLastItem (Some (`Qed uri));
New_state Command
| TacticAst.Seq tacticals ->
- (* TODO Zack check for proof completed at each step? *)
+ (* TODO ZACK check for proof completed at each step? *)
+ (* TODO ZACK code completely broken here: we must build logic level
+ * tacticals instead of iterating interpreter evaluation *)
+ if (List.length tacticals > 1) then
+ warning "tacticals are broken: see matitaInterpreter.ml";
List.iter (fun t -> ignore (self#evalTactical t)) tacticals;
+ self#setLastItem (Some `Tactic);
New_state Proof
| TacticAst.Tactic tactic_phrase ->
- let tactic = lookup_tactic tactic_phrase in
+ let tactic = self#lookup_tactic tactic_phrase in
currentProof#proof#apply_tactic tactic;
+ self#setLastItem (Some `Tactic);
New_state Proof
| tactical -> shared#evalTactical tactical
end
-class interpreter
- ~(disambiguator: MatitaTypes.disambiguator)
- ~(currentProof: MatitaTypes.currentProof)
- ~(console: MatitaTypes.console)
- ?mathViewer
- ~(dbd: Mysql.dbd)
- ()
-=
- let commandState =
- new commandState ~disambiguator ~currentProof ~console ?mathViewer ~dbd ()
- in
- let proofState =
- new proofState ~disambiguator ~currentProof ~console ?mathViewer ~dbd ()
- in
+class interpreter ~(console: #MatitaTypes.console) ?mathViewer () =
+ let commandState = new commandState ~console ?mathViewer () in
+ let proofState = new proofState ~console ?mathViewer () in
object (self)
val mutable state = commandState
- method reset = state <- commandState
+ method setState (tag: [`Proof | `Command]) =
+ match tag with
+ | `Proof -> (state <- proofState)
+ | `Command -> (state <- commandState)
method endOffset = state#endOffset
| _ -> ()
method private eval f =
- let ok () = console#clear (); (true, true) in
+ let ok () = (* console#clear (); *) (true, true) in
match console#wrap_exn f with
| Some (New_state Command) -> (state <- commandState); ok ()
| Some (New_state Proof) -> (state <- proofState); ok ()
method evalPhrase s = self#eval (fun () -> state#evalPhrase s)
method evalAst ast = self#eval (fun () -> state#evalAst ast)
+
+ (** {2 methods delegated to current state} *)
+
+ method endOffset = state#endOffset
+ method lastItem = state#lastItem
+ method setEvalAstCallback = state#setEvalAstCallback
end
+let interpreter ~(console: #MatitaTypes.console) ?mathViewer () =
+ new interpreter ~console ?mathViewer ()
+
projects / helm.git / blobdiff