exception No_proof (** no current proof is available *)
+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"
| 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 parseTactical: char Stream.t -> DisambiguateTypes.tactical
end
+ (* subset of MatitaConsole.console methods needed by MatitaInterpreter *)
+class type console =
+ object
+ method echo_message : string -> unit
+ method echo_error : string -> unit
+ method clear : unit -> unit
+ method wrap_exn : (unit -> unit) -> bool
+ end
+
class type disambiguator =
object
method parserr: parserr
?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)
(** @param env @see disambiguateTerm above *)
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)
+
+ (** as disambiguateTermAst, but disambiguate a list of ASTs at once. All
+ * AST should be closed hence no context param is permitted on this method
+ *)
+ method disambiguateTermAsts:
+ ?metasenv:Cic.metasenv ->
+ ?env:DisambiguateTypes.environment ->
+ DisambiguateTypes.term list ->
+ (DisambiguateTypes.environment * Cic.metasenv * Cic.term list *
+ CicUniv.universe_graph)
end
-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
+(*
+type sequents_metadata =
+ (int * (** sequent (meta) index *)
+ (Cic.annconjecture * (** annotated conjecture *)
+ (Cic.id, Cic.term) Hashtbl.t * (** ids_to_terms *)
+ (Cic.id, Cic.id option) Hashtbl.t * (** ids_to_father_ids *)
+ (Cic.id, string) Hashtbl.t * (** ids_to_inner_sorts *)
+ (Cic.id, Cic.hypothesis) Hashtbl.t)) (** ids_to_hypotheses *)
+ list
+type proof_metadata =
+ Cic.annobj * (** annotated object *)
+ (Cic.id, Cic.term) Hashtbl.t * (** ids_to_terms *)
+ (Cic.id, Cic.id option) Hashtbl.t * (** ids_to_father_ids *)
+ (Cic.id, string) Hashtbl.t * (** ids_to_inner_sorts *)
+ (Cic.id, Cic2acic.anntypes) Hashtbl.t * (** ids_to_inner_types *)
+ (Cic.id, Cic.conjecture) Hashtbl.t * (** ids_to_conjectures *)
+ (Cic.id, Cic.hypothesis) Hashtbl.t (** ids_to_hypotheses *)
+type hist_metadata = proof_metadata * sequents_metadata
+*)
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 *)
type proof_handler =
{ get_proof: unit -> proof; (* return current proof or fail *)
- set_proof: proof option -> unit; (* set a proof option as current proof *)
+ set_proof: proof option -> unit;
+ abort_proof: unit -> unit;(* abort current proof, cleaning up garbage *)
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 *)
(** interpreter for toplevel phrases given via console *)
class type interpreter =
object
- method evalPhrase: string -> unit
+ method reset: unit (** return the interpreter to the initial state *)
+
+ (** parse a single phrase contained in the input string. Additional
+ * garbage at the end of the phrase is ignored
+ * @return true if no exception has been raised by the evaluation, false
+ * otherwise
+ *)
+ method evalPhrase: string -> bool
+
+ (** as above, evaluating a command/tactics AST *)
+ method evalAst: DisambiguateTypes.tactical -> bool
+
+ (** offset from the starting of the last string parser by evalPhrase where
+ * parsing stop.
+ * @raise Failure when no offset has been recorded *)
+ method endOffset: int
+
end
(** {2 MathML widgets} *)
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 *
(string, string) Hashtbl.t -> (string, Cic2acic.anntypes) Hashtbl.t ->
Gdome.document
- (** TODO Zack to be reviewed and unified with proof_viewer above *)
+class type proof_viewer =
+ object
+ inherit GMathViewAux.single_selection_math_view
+
+ method load_proof: StatefulProofEngine.proof_status -> unit
+ end
+
class type sequent_viewer =
object
inherit GMathViewAux.multi_selection_math_view
method get_selected_hypotheses: Cic.hypothesis list
(** load a sequent and render it into parent widget *)
- method load_sequent: Cic.metasenv -> Cic.conjecture -> unit
+ method load_sequent: Cic.metasenv -> int -> unit
end
-class type proof_viewer =
+class type sequents_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
-
+ method reset: unit
+ method load_sequents: Cic.metasenv -> unit
+ method goto_sequent: int -> unit (* to be called _after_ load_sequents *)
end
(** {2 shorthands} *)