open Utils
-module Env = Map.Make (String)
+module Env = struct
+ include Map.Make (String)
+
+ let merge env env' =
+ List.fold_left (fun env (k, v) -> add k v env) env (bindings env')
+end
type loc = position * position
let noloc = dummy_pos, dummy_pos
type env = expr Env.t
and pattern =
- | PTactic of loc * id * substs list
- | PVar of loc * id
+ | PPred of loc * id * substs list
and expr =
- | EGoal of loc * goal
+ | EGoalDefn of loc * goal
+ | EFuncDefn of loc * func
+ | EPredDefn of loc * pred
| ECall of loc * id * expr list
- | ETactic of loc * id * expr list
+ | EPredCtor of loc * id * expr list
| EVar of loc * id
| EList of loc * expr list
| ESubsts of loc * substs
| 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 * returning * bool * code
+and pred = param_decl list * code
+and param_decl = id
and id = string
-and code = substs
+and code = substs * bool
+and returning = RetExpr | RetStrings | RetString
and substs = subst list
and subst =
| SString of string
failwithf "%a: goal ‘%s’ not found" string_loc loc name in
let goal =
match expr with
- | EGoal (loc, goal) -> goal
+ | EGoalDefn (loc, goal) -> goal
| _ ->
failwithf "%a: tried to call ‘%s’ which is not a goal"
string_loc loc name in
goal
-let rec to_constant env = function
- | EConstant (loc, c) -> c
-
- | EVar (loc, name) ->
- let expr = getvar env loc name in
- to_constant env expr
-
- | ESubsts (loc, str) ->
- CString (substitute env loc str)
-
- | EList (loc, _) ->
- failwithf "%a: list found where constant expression expected"
- string_loc loc
-
- | ECall (loc, name, _) ->
- failwithf "%a: cannot use goal ‘%s’ in constant expression"
- string_loc loc name
-
- | ETactic (loc, name, _) ->
- failwithf "%a: cannot use tactic ‘*%s’ in constant expression"
- string_loc loc name
-
- | EGoal (loc, _) ->
- failwithf "%a: cannot use goal in constant expression"
- string_loc loc
+let getfunc env loc name =
+ let expr =
+ try Env.find name env
+ with Not_found ->
+ failwithf "%a: func ‘%s’ not found" string_loc loc name in
+ let func =
+ match expr with
+ | EFuncDefn (loc, func) -> func
+ | _ ->
+ failwithf "%a: tried to call ‘%s’ which is not a function"
+ string_loc loc name in
+ func
-and substitute env loc substs =
- let b = Buffer.create 13 in
- List.iter (
- function
- | SString s -> Buffer.add_string b s
- | SVar name ->
- let expr = getvar env loc name in
- match to_constant env expr with
- | CString s -> Buffer.add_string b s
- ) substs;
- Buffer.contents b
+let getpred env loc name =
+ assert (String.length name >= 3 && String.sub name 0 3 = "is-");
+ let expr =
+ try Env.find name env
+ with Not_found ->
+ failwithf "%a: predicate ‘%s’ not found" string_loc loc name in
+ let pred =
+ match expr with
+ | EPredDefn (loc, pred) -> pred
+ | _ ->
+ failwithf "%a: tried to call ‘%s’ which is not a predicate"
+ string_loc loc name in
+ pred
module Substs = struct
type t = {
f fp x
) xs
-let rec print_env fp env =
- Env.iter (print_def fp) env
+let rec string_env () env =
+ let env = Env.bindings env in
+ String.concat "" (List.map (string_def ()) env)
+
+and print_env fp env = output_string fp (string_env () env)
-and print_def fp name expr =
+and string_def () (name, expr) =
match expr with
- | EGoal (loc, (params, patterns, exprs, code)) ->
- fprintf fp "goal %s (%s) =\n" name (String.concat ", " params);
- fprintf fp " ";
- iter_with_commas fp print_pattern patterns;
- fprintf fp " : ";
- iter_with_commas fp print_expr exprs;
- (match code with
- | None -> ()
- | Some code ->
- fprintf fp " {\n";
- print_code fp code;
- fprintf fp "\n }"
- );
- fprintf fp "\n"
- | expr ->
- fprintf fp "let %s = " name;
- print_expr fp expr;
- fprintf fp "\n"
+ | EGoalDefn (loc, goal) -> string_goal () (Some name, goal) ^ "\n"
+ | EFuncDefn (loc, func) -> string_func () (Some name, func) ^ "\n"
+ | EPredDefn (loc, pred) -> string_pred () (Some name, pred) ^ "\n"
+ | expr -> sprintf "let %s = %a\n" name string_expr expr;
+
+and print_def fp name expr = output_string fp (string_def () (name, expr))
+
+and string_goal () (name, (param_decls, patterns, exprs, code)) =
+ sprintf "goal%s (%s) = %s : %s%s"
+ (match name with None -> "" | Some name -> " " ^ name)
+ (String.concat ", " (List.map (string_param_decl ()) param_decls))
+ (String.concat ", " (List.map (string_pattern ()) patterns))
+ (String.concat ", " (List.map (string_expr ()) exprs))
+ (match code with None -> ""
+ | Some (code, false) -> " = { ... }"
+ | Some (code, true) -> " = @{ ... }")
+
+and string_func () (name, (param_decls, returning, pure, (code, quiet))) =
+ sprintf "%sfunction%s returning %s (%s) = %s{ ... }"
+ (if pure then "pure " else "")
+ (match name with None -> "" | Some name -> " " ^ name)
+ (match returning with RetExpr -> "expression"
+ | RetString -> "string"
+ | RetStrings -> "strings")
+ (String.concat ", " (List.map (string_param_decl ()) param_decls))
+ (if quiet then "@" else "")
+
+and string_pred () (name, (param_decls, (code, quiet))) =
+ sprintf "predicate%s (%s) = %s{ ... }"
+ (match name with None -> "" | Some name -> " " ^ name)
+ (String.concat ", " (List.map (string_param_decl ()) param_decls))
+ (if quiet then "@" else "")
+
+and string_param_decl () name = name
and string_pattern () = function
- | PTactic (loc, name, params) ->
- sprintf "*%s (%s)" name (String.concat ", "
- (List.map (string_substs ()) params));
- | PVar (loc, id) -> id
+ | PPred (loc, name, params) ->
+ sprintf "%s (%s)" name (String.concat ", "
+ (List.map (string_substs ()) params))
and print_pattern fp p = output_string fp (string_pattern () p)
and string_expr () = function
- | EGoal (loc, (params, patterns, exprs, code)) ->
- sprintf "goal (%s) = %s : %s%s"
- (String.concat ", " params)
- (String.concat ", " (List.map (string_pattern ()) patterns))
- (String.concat ", " (List.map (string_expr ()) exprs))
- (match code with None -> "" | Some code -> " = { ... }")
+ | EGoalDefn (loc, goal) -> string_goal () (None, goal)
+ | EFuncDefn (loc, func) -> string_func () (None, func)
+ | EPredDefn (loc, goal) -> string_pred () (None, goal)
| ECall (loc, name, params) ->
sprintf "%s (%s)"
name (String.concat ", " (List.map (string_expr ()) params))
- | ETactic (loc, name, params) ->
- sprintf "*%s (%s)"
+ | EPredCtor (loc, name, params) ->
+ sprintf "%s (%s)"
name (String.concat ", " (List.map (string_expr ()) params))
| EVar (loc, var) -> var
| EList (loc, xs) ->
git.annexia.org / goals.git / blobdiff