X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaTypes.ml;h=c49bce0040049595cbcceda5b405559dc4bb713b;hb=87ff483dd776e580fa97fca0e3bf888cc8a8d540;hp=70f912ae08fd586abe7fad584cdcfb4845010886;hpb=06c2b37f3d7d4e14cabeef3b18211e5d12b9b4eb;p=helm.git diff --git a/helm/matita/matitaTypes.ml b/helm/matita/matitaTypes.ml index 70f912ae0..c49bce004 100644 --- a/helm/matita/matitaTypes.ml +++ b/helm/matita/matitaTypes.ml @@ -23,18 +23,34 @@ * 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) + +exception No_proof +exception Cancel +exception Unbound_identifier of string + +(* let untitled_con_uri = UriManager.uri_of_string "cic:/untitled.con" let untitled_def_uri = UriManager.uri_of_string "cic:/untitled.ind" @@ -42,6 +58,8 @@ 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 @@ -49,6 +67,14 @@ class type parserr = (* "parser" is a keyword :-( *) method parseTactical: char Stream.t -> DisambiguateTypes.tactical 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 = object method parserr: parserr @@ -57,64 +83,64 @@ 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 disambiguation environment. If this parameter is given the - * disambiguator act statelessly, that is internal disambiguation status - * want be changed but only returned. If this parameter is not given the - * internal one will be used and updated with the disambiguation status - * resulting from the disambiguation *) method disambiguateTerm: ?context:Cic.context -> ?metasenv:Cic.metasenv -> ?env:DisambiguateTypes.environment -> char Stream.t -> - (DisambiguateTypes.environment * Cic.metasenv * Cic.term) - (** @param env @see disambiguateTerm above *) + (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) - end + (DisambiguateTypes.environment * Cic.metasenv * Cic.term * + CicUniv.universe_graph) -type hist_metadata = - Cic.annobj * - (Cic.id, Cic.term) Hashtbl.t * - (Cic.id, Cic.id option) Hashtbl.t * - (Cic.id, string) Hashtbl.t * - (Cic.id, Cic2acic.anntypes) Hashtbl.t * - (Cic.id, Cic.conjecture) Hashtbl.t * - (Cic.id, Cic.hypothesis) Hashtbl.t + method disambiguateTermAsts: + ?metasenv:Cic.metasenv -> + ?env:DisambiguateTypes.environment -> + DisambiguateTypes.term list -> + (DisambiguateTypes.environment * Cic.metasenv * Cic.term list * + CicUniv.universe_graph) + end class type proof = object - inherit [hist_metadata] StatefulProofEngine.status + inherit [unit] StatefulProofEngine.status - (** 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 end -type proof_handler = - { get_proof: unit -> proof; (* return current proof or fail *) - set_proof: proof option -> unit; (* set a proof option as current proof *) - has_proof: unit -> bool; (* check if a current proof is available or not *) - new_proof: proof -> unit; (* as a set_proof but takes care also to register - observers *) - quit: unit -> 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 + +type command_outcome = bool * bool - (** interpreter for toplevel phrases given via console *) class type interpreter = object - method evalPhrase: string -> unit + 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 -(** {2 MathML widgets} *) +class type mathViewer = + object + method checkTerm: Cic.conjecture -> Cic.metasenv -> unit + method unload: unit -> unit + method set_href_callback: (UriManager.uri -> unit) option -> unit + end type mml_of_cic_sequent = - Cic.metasenv -> int * Cic.context * Cic.term -> + Cic.metasenv -> Cic.conjecture -> Gdome.document * ((Cic.id, Cic.term) Hashtbl.t * (Cic.id, Cic.id option) Hashtbl.t * @@ -125,35 +151,6 @@ type mml_of_cic_object = (string, string) Hashtbl.t -> (string, Cic2acic.anntypes) Hashtbl.t -> Gdome.document - (** TODO Zack to be reviewed and unified with proof_viewer above *) -class type sequent_viewer = - object - inherit GMathViewAux.multi_selection_math_view - - (** @return the list of selected terms. Selections which are not terms are - * ignored *) - method get_selected_terms: Cic.term list - - (** @return the list of selected hypothese. Selections which are not - * hypotheses are ignored *) - method get_selected_hypotheses: Cic.hypothesis list - - (** load a sequent and render it into parent widget *) - method load_sequent: Cic.metasenv -> Cic.conjecture -> unit - end - -class type proof_viewer = - object - inherit GMathViewAux.single_selection_math_view - - (** @return the annotated cic term and the ids_to_inner_types and - * ids_to_inner_sorts maps *) - method load_proof: Gdome.document -> hist_metadata -> unit - - end - -(** {2 shorthands} *) - type namer = ProofEngineTypes.mk_fresh_name_type type choose_uris_callback = @@ -161,6 +158,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") +