val fold: (key -> 'a -> 'b -> 'b) -> 'a t -> 'b -> 'b
val filter: (key -> 'a -> bool) -> 'a t -> 'a t
val bindings: 'a t -> (key * 'a) list
+
+ (* This is not the normal Map.merge function. *)
+ val merge : 'a t -> 'a t -> 'a t
end
(** Location where we parsed from $loc = $startpos, $endpos *)
and pattern =
(** match tactic such as *file ("filename") *)
| PTactic of loc * id * substs list
- (** match named variable, which must be a string, ETactic or
- a list of those *)
- | PVar of loc * id
and expr =
- (** goal (params) = patterns : exprs = code *)
- | EGoal of loc * goal
- (** goalname (params) etc. *)
+ (** goal (params) = patterns : exprs code *)
+ | EGoalDefn of loc * goal
+ (** function (params) = code *)
+ | EFuncDefn of loc * func
+ (** tactic (params) = code *)
+ | ETacticDefn of loc * tactic
+ (** call goal (params) or function (params) *)
| ECall of loc * id * expr list
- (** *tactic (params) etc. *)
- | ETactic of loc * id * expr list
+ (** call *tactic (params) etc. *)
+ | ETacticCtor of loc * id * expr list
(** variable, or goal call with no parameters *)
| EVar of loc * id
(** list *)
| EConstant of loc * constant
and constant =
| CString of string
-and goal = id list * pattern list * expr list * code option
+and goal = param_decl list * pattern list * expr list * code option
+and func = param_decl list * code
+and tactic = param_decl list * code
+ (** Goal/func/tactic parameter. *)
+and param_decl = id
and id = string
and code = substs
and substs = subst list
found or if the named variable is not a goal. *)
val getgoal : env -> loc -> id -> goal
-(** Take any expression and simplify it down to a constant.
- If the expression cannot be simplified then this raises
- [Failure _]. *)
-val to_constant : env -> expr -> constant
+(** Look up a function in the environment. Raise [Failure _] if not
+ found or if the named variable is not a function. *)
+val getfunc : env -> loc -> id -> func
-(** Take a substitution list and try to turn it into a simple
- string by evaluating every variable. If not possible this
- raises [Failure _]. *)
-val substitute : env -> loc -> substs -> string
+(** Look up a tactic in the environment. Raise [Failure _] if not
+ found or if the named variable is not a tactic. *)
+val gettactic : env -> loc -> id -> tactic
(** This is used for incrementally building Ast.substs in the parser. *)
module Substs : sig
val add_var : t -> string -> unit
end
-(** Print all definitions in an environment. *)
-val print_env : out_channel -> env -> unit
-
(** %a formatters. *)
+val print_env : out_channel -> env -> unit
val string_pattern : unit -> pattern -> string
val string_expr : unit -> expr -> string
+val print_expr : out_channel -> expr -> unit