X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=src%2Fast.mli;h=225e42975f75bf66431ad746e19026f865778206;hb=5e13f1e2a3dc1237fcf2fa141d8379bdd36bde61;hp=df6c60f2b9a2f61b920c85d56c982caf37870276;hpb=c07380a3a4dca44a29df4cb09265d10442c1d06f;p=goals.git

diff --git a/src/ast.mli b/src/ast.mli
index df6c60f..225e429 100644
--- a/src/ast.mli
+++ b/src/ast.mli
@@ -41,19 +41,19 @@ val string_loc : unit -> loc -> string
     variable or goal name -> expression. *)
 type env = expr Env.t
 and pattern =
-  | PTactic of loc * id * substs list
-  (** match tactic such as *file ("filename") *)
+  | PPred of loc * id * substs list
+  (** match predicate such as is-file ("filename") *)
 and expr =
   | EGoalDefn of loc * goal
   (** goal (params) = patterns : exprs code *)
   | EFuncDefn of loc * func
   (** function (params) = code *)
-  | ETacticDefn of loc * tactic
-  (** tactic (params) = code *)
+  | EPredDefn of loc * pred
+  (** predicate (params) = code *)
   | ECall of loc * id * expr list
   (** call goal (params) or function (params) *)
-  | ETacticCtor of loc * id * expr list
-  (** constructor *tactic (params) *)
+  | EPredCtor of loc * id * expr list
+  (** constructor is-predicate (params) *)
   | EVar of loc * id
   (** variable, or goal call with no parameters *)
   | EList of loc * expr list
@@ -65,11 +65,11 @@ and expr =
 and constant =
   | CString of string
 and goal = param_decl list * pattern list * expr list * code option
-and func = param_decl list * returning * code
-and tactic = param_decl list * code
-and param_decl = id             (** goal/func/tactic parameter. *)
+and func = param_decl list * returning * bool * code
+and pred = param_decl list * code
+and param_decl = id             (** goal/func/pred parameter. *)
 and id = string
-and code = substs
+and code = substs * bool        (** code + quiet flag *)
 and returning = RetExpr | RetStrings | RetString
 and substs = subst list
 and subst =
@@ -90,9 +90,9 @@ val getfunc : env -> loc -> id -> func
 (** Look up a function in the environment.  Raise [Failure _] if not
     found or if the named variable is not a function. *)
 
-val gettactic : env -> loc -> id -> tactic
-(** Look up a tactic in the environment.  Raise [Failure _] if not
-    found or if the named variable is not a tactic. *)
+val getpred : env -> loc -> id -> pred
+(** Look up a predicate in the environment.  Raise [Failure _] if not
+    found or if the named variable is not a predicate. *)
 
 (** This is used for incrementally building Ast.substs in the parser. *)
 module Substs : sig