X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fmatita%2FmatitaTypes.ml;h=5305ea463d66cec6a780a76c2cc6fefd14250362;hb=ac813b7e251e4bac1a8a16befa628203775771ca;hp=4e81148c34f817e492b12f6c7d472e1c9f131b53;hpb=481992ea591bf53cba758a96e7d42e9cdce7e129;p=helm.git diff --git a/helm/matita/matitaTypes.ml b/helm/matita/matitaTypes.ml index 4e81148c3..5305ea463 100644 --- a/helm/matita/matitaTypes.ml +++ b/helm/matita/matitaTypes.ml @@ -23,51 +23,56 @@ * http://helm.cs.unibo.it/ *) +open Printf + exception Not_implemented of string let not_implemented feature = raise (Not_implemented feature) - (** exceptions whose content should be presented to the user *) exception Failure of string let error s = raise (Failure s) let warning s = prerr_endline ("MATITA WARNING:\t" ^ s) let debug_print s = if BuildTimeConf.debug then prerr_endline ("MATITA DEBUG:\t" ^ s) -exception No_proof (** no current proof is available *) +let explain = function + | StatefulProofEngine.Tactic_failure exn -> + sprintf "Tactic failed: %s"(Printexc.to_string exn) + | StatefulProofEngine.Observer_failures exns -> + String.concat "\n" + (List.map (fun (_, exn) -> Printexc.to_string exn) exns) + | CicTextualParser2.Parse_error (floc, msg) -> + let (x, y) = CicAst.loc_of_floc floc in + sprintf "parse error at character %d-%d: %s" x y msg + | exn -> sprintf "Uncaught exception: %s" (Printexc.to_string exn) -let untitled_con_uri = UriManager.uri_of_string "cic:/untitled.con" -let untitled_def_uri = UriManager.uri_of_string "cic:/untitled.def" +exception No_proof -class type observer = - (* "observer" pattern *) - object - method update: unit -> unit - end +exception Cancel +exception Unbound_identifier of string -class subject = - (* "observer" pattern *) - object - val mutable observers = [] - method attach (o: observer) = observers <- o :: observers - method detach (o: observer) = - observers <- List.filter (fun o' -> o' != o) observers - method notify () = List.iter (fun o -> o#update ()) observers - end +(* +let untitled_con_uri = UriManager.uri_of_string "cic:/untitled.con" +let untitled_def_uri = UriManager.uri_of_string "cic:/untitled.ind" -class type command = - (* "command" pattern *) - object - method execute: unit -> unit - method undo: unit -> unit - end +let unopt_uri ?(kind = `Con) = function + | Some uri -> uri + | None -> + (match kind with `Con -> untitled_con_uri | `Def -> untitled_def_uri) +*) +let unopt_uri = function Some uri -> uri | None -> assert false class type parserr = (* "parser" is a keyword :-( *) object method parseTerm: char Stream.t -> DisambiguateTypes.term - method parseTactic: char Stream.t -> DisambiguateTypes.tactic method parseTactical: char Stream.t -> DisambiguateTypes.tactical - method parseCommand: char Stream.t -> DisambiguateTypes.command - method parseScript: char Stream.t -> DisambiguateTypes.script + end + +class type console = + object + method echo_message : string -> unit + method echo_error : string -> unit + method clear : unit -> unit + method wrap_exn : 'a. (unit -> 'a) -> 'a option end class type disambiguator = @@ -78,53 +83,72 @@ class type disambiguator = method env: DisambiguateTypes.environment method setEnv: DisambiguateTypes.environment -> unit - (* TODO Zack: as long as matita doesn't support MDI inteface, - * disambiguateTerm will return a single term *) - (** @param env defaults to self#env *) method disambiguateTerm: ?context:Cic.context -> ?metasenv:Cic.metasenv -> ?env:DisambiguateTypes.environment -> char Stream.t -> - (DisambiguateTypes.environment * Cic.metasenv * Cic.term) + (DisambiguateTypes.environment * Cic.metasenv * Cic.term * + CicUniv.universe_graph) method disambiguateTermAst: ?context:Cic.context -> ?metasenv:Cic.metasenv -> ?env:DisambiguateTypes.environment -> DisambiguateTypes.term -> - (DisambiguateTypes.environment * Cic.metasenv * Cic.term) + (DisambiguateTypes.environment * Cic.metasenv * Cic.term * + CicUniv.universe_graph) + + method disambiguateTermAsts: + ?metasenv:Cic.metasenv -> + ?env:DisambiguateTypes.environment -> + DisambiguateTypes.term list -> + (DisambiguateTypes.environment * Cic.metasenv * Cic.term list * + CicUniv.universe_graph) end -class type proofStatus = +class type proof = object - inherit subject + inherit [unit] StatefulProofEngine.status - (** {3 properties} *) - - method proof: ProofEngineTypes.proof - method setProof: ProofEngineTypes.proof -> unit - - method goal: ProofEngineTypes.goal option - method setGoal: ProofEngineTypes.goal option -> unit + method toXml: Xml.token Stream.t * Xml.token Stream.t + method toString: string + end - (** @raise MatitaTypes.No_proof *) - method status: ProofEngineTypes.status (* proof, goal *) - method setStatus: ProofEngineTypes.status -> unit +class type currentProof = + object + method onGoing: unit -> bool + method proof: proof + method start: proof -> unit + method abort: unit -> unit + method quit: unit -> unit + end - (** {3 actions} *) +type command_outcome = bool * bool - (** return a pair of "xml" (as defined in Xml module) representing the * - * current proof type and body, respectively *) - method toXml: Xml.token Stream.t * Xml.token Stream.t - method toString: string +class type interpreter = + object + method endOffset : int + method evalAst : DisambiguateTypes.tactical -> command_outcome + method evalPhrase : string -> command_outcome +(* method evalStream: char Stream.t -> command_outcome *) + method reset : unit end -class type proof = +class type mathViewer = object - (** {3 status} *) - method status: proofStatus - method setStatus: proofStatus -> unit + method checkTerm: Cic.conjecture -> Cic.metasenv -> unit + method unload: unit -> unit end -(** {2 shorthands} *) +type mml_of_cic_sequent = + Cic.metasenv -> Cic.conjecture -> + Gdome.document * + ((Cic.id, Cic.term) Hashtbl.t * + (Cic.id, Cic.id option) Hashtbl.t * + (string, Cic.hypothesis) Hashtbl.t) + +type mml_of_cic_object = + explode_all:bool -> UriManager.uri -> Cic.annobj -> + (string, string) Hashtbl.t -> (string, Cic2acic.anntypes) Hashtbl.t -> + Gdome.document type namer = ProofEngineTypes.mk_fresh_name_type @@ -133,6 +157,9 @@ type choose_uris_callback = ?title:string -> ?msg:string -> ?nonvars_button:bool -> string list -> string list - type choose_interp_callback = (string * string) list list -> int list +let mono_uris_callback ~selection_mode ?title ?msg ?nonvars_button _ = + raise (Failure "ambiguous input") +let mono_interp_callback _ = raise (Failure "ambiguous input") +