| Type of UriManager.uri * int
type 'lazy_term reduction =
- [ `Demodulate
- | `Normalize
+ [ `Normalize
| `Reduce
| `Simpl
| `Unfold of 'lazy_term option
type ('term, 'lazy_term, 'reduction, 'ident) tactic =
| Absurd of loc * 'term
| Apply of loc * 'term
+ | ApplyS of loc * 'term * (string * string) list
| Assumption of loc
- | Auto of loc * int option * int option * string option * string option
- (* depth, width, paramodulation, full *) (* ALB *)
+ | Auto of loc * (string * string) list
| Change of loc * ('term, 'lazy_term, 'ident) pattern * 'lazy_term
- | Clear of loc * 'ident
+ | Clear of loc * 'ident list
| ClearBody of loc * 'ident
- | Compare of loc * 'term
| Constructor of loc * int
| Contradiction of loc
| Cut of loc * 'ident option * 'term
- | DecideEquality of loc
- | Decompose of loc * ('term, 'ident) type_spec list * 'ident * 'ident list
- | Discriminate of loc * 'term
+ | Decompose of loc * ('term, 'ident) type_spec list * 'ident option * 'ident list
+ | Demodulate of loc
+ | Destruct of loc * 'term
| Elim of loc * 'term * 'term option * int option * 'ident list
| ElimType of loc * 'term * 'term option * int option * 'ident list
| Exact of loc * 'term
| Generalize of loc * ('term, 'lazy_term, 'ident) pattern * 'ident option
| Goal of loc * int (* change current goal, argument is goal number 1-based *)
| IdTac of loc
- | Injection of loc * 'term
| Intros of loc * int option * 'ident list
| Inversion of loc * 'term
- | LApply of loc * int option * 'term list * 'term * 'ident option
+ | LApply of loc * bool * int option * 'term list * 'term * 'ident option
| Left of loc
| LetIn of loc * 'term * 'ident
| Reduce of loc * 'reduction * ('term, 'lazy_term, 'ident) pattern
| Right of loc
| Ring of loc
| Split of loc
+ | Subst of loc
| Symmetry of loc
| Transitivity of loc * 'term
-
+ (* Costruttori Aggiunti *)
+ | Assume of loc * 'ident * 'term
+ | Suppose of loc * 'term *'ident * 'term option
+ | By_term_we_proved of loc *'term option * 'term * 'ident option * 'term option
+ | We_need_to_prove of loc * 'term * 'ident option * 'term option
+ | Bydone of loc * 'term option
+ | We_proceed_by_induction_on of loc * 'term * 'term
+ | Byinduction of loc * 'term * 'ident
+ | Thesisbecomes of loc * 'term
+ | Case of loc * string * (string * 'term) list
+ | ExistsElim of loc * 'term * 'ident * 'term * 'ident * 'term
+ | AndElim of loc * 'term * 'ident * 'term * 'ident * 'term
+ | RewritingStep of
+ loc * (string option * 'term) option * 'term *
+ [ `Term of 'term | `Auto of (string * string) list ] *
+ bool (* last step*)
+
type search_kind = [ `Locate | `Hint | `Match | `Elim ]
type print_kind = [ `Env | `Coer ]
| WLocate of loc * string
| WElim of loc * 'term
(* real macros *)
-(* | Abort of loc *)
- | Print of loc * string
| Check of loc * 'term
| Hint of loc
- | Quit of loc
-(* | Redo of loc * int option
- | Undo of loc * int option *)
-(* | Print of loc * print_kind *)
- | Search_pat of loc * search_kind * string (* searches with string pattern *)
- | Search_term of loc * search_kind * 'term (* searches with term pattern *)
+ | Inline of loc * string * string (* URI or base-uri, name prefix *)
(** To be increased each time the command type below changes, used for "safe"
* marshalling *)
-let magic = 5
+let magic = 11
-type 'obj command =
+type ('term,'obj) command =
+ | Index of loc * 'term option (* key *) * UriManager.uri (* value *)
+ | Coercion of loc * UriManager.uri * bool (* add_obj *) * int (* arity *)
| Default of loc * string * UriManager.uri list
+ | Drop of loc
| Include of loc * string
+ | Obj of loc * 'obj
+ | Relation of
+ loc * string * 'term * 'term * 'term option * 'term option * 'term option
| Set of loc * string * string
- | Drop of loc
+ | Print of loc * string
| Qed of loc
- | Coercion of loc * UriManager.uri * bool (* add composites *)
- | Obj of loc * 'obj
type ('term, 'lazy_term, 'reduction, 'ident) tactical =
| Tactic of loc * ('term, 'lazy_term, 'reduction, 'ident) tactic
| Try of loc * ('term, 'lazy_term, 'reduction, 'ident) tactical
(* try a tactical and mask failures *)
| Solve of loc * ('term, 'lazy_term, 'reduction, 'ident) tactical list
+ | Progress of loc * ('term, 'lazy_term, 'reduction, 'ident) tactical
| Dot of loc
| Semicolon of loc
| Branch of loc
| Shift of loc
- | Pos of loc * int
+ | Pos of loc * int list
+ | Wildcard of loc
| Merge of loc
| Focus of loc * int list
| Unfocus of loc
| _ -> false
type ('term, 'lazy_term, 'reduction, 'obj, 'ident) code =
- | Command of loc * 'obj command
+ | Command of loc * ('term, 'obj) command
| Macro of loc * 'term macro
| Tactical of loc * ('term, 'lazy_term, 'reduction, 'ident) tactical
* ('term, 'lazy_term, 'reduction, 'ident) tactical option(* punctuation *)