open Utils
+let pure_cache = Hashtbl.create 13
+
let rec to_constant env = function
| Ast.EConstant (loc, c) -> c
Ast.string_loc loc name
)
- | ETacticCtor (loc, name, _) ->
- failwithf "%a: cannot use tactic ‘%s’ in constant expression"
+ | EPredCtor (loc, name, _) ->
+ failwithf "%a: cannot use predicate ‘%s’ in constant expression"
Ast.string_loc loc name
| EGoalDefn (loc, _) ->
failwithf "%a: cannot use function in constant expression"
Ast.string_loc loc
- | ETacticDefn (loc, _) ->
- failwithf "%a: cannot use tactic in constant expression"
+ | EPredDefn (loc, _) ->
+ failwithf "%a: cannot use predicate in constant expression"
Ast.string_loc loc
and substitute env loc substs =
Ast.string_loc loc name
)
- (* Tactics expand to the first parameter. *)
- | ETacticCtor (loc, _, []) -> Filename.quote ""
- | ETacticCtor (loc, _, (arg :: _)) -> expr_to_shell_string env arg
+ (* Predicates expand to the first parameter. *)
+ | EPredCtor (loc, _, []) -> Filename.quote ""
+ | EPredCtor (loc, _, (arg :: _)) -> expr_to_shell_string env arg
| EGoalDefn (loc, _) ->
failwithf "%a: cannot use goal in shell expansion"
failwithf "%a: cannot use function in shell expansion"
Ast.string_loc loc
- | ETacticDefn (loc, _) ->
- failwithf "%a: cannot use tactic in shell expansion"
+ | EPredDefn (loc, _) ->
+ failwithf "%a: cannot use predicate in shell expansion"
Ast.string_loc loc
-and run_code ?(quiet = false) env loc code =
- let code = to_shell_script env loc code in
- let code =
- "source " ^ Filename.quote Cmdline.prelude_sh_file ^ "\n" ^
- "set -e\n" ^
- (if not quiet then "set -x\n" else "") ^
- "\n" ^
- code in
+and run_code env loc code =
+ let code = prepare_code env loc code in
+ Sys.command code
+and run_code_to_string env loc code =
+ let code = prepare_code env loc code in
let chan = Unix.open_process_in code in
let b = Buffer.create 1024 in
(try
failwithf "%a: stopped by signal %d" Ast.string_loc loc i in
i, Buffer.contents b
+and run_code_to_string_list env loc code =
+ let code = prepare_code env loc code in
+ let chan = Unix.open_process_in code in
+ let lines = ref [] in
+ (try while true do lines := input_line chan :: !lines done
+ with End_of_file -> ());
+ let st = Unix.close_process_in chan in
+ let i =
+ match st with
+ | Unix.WEXITED i -> i
+ | Unix.WSIGNALED i ->
+ failwithf "%a: killed by signal %d" Ast.string_loc loc i
+ | Unix.WSTOPPED i ->
+ failwithf "%a: stopped by signal %d" Ast.string_loc loc i in
+ let lines = List.rev !lines in
+ i, lines
+
+and prepare_code env loc (code, quiet) =
+ let quiet = if Cmdline.debug_flag () then false else quiet in
+ let code = to_shell_script env loc code in
+ "source " ^ Filename.quote Cmdline.prelude_sh_file ^ "\n" ^
+ "set -e\n" ^
+ (if not (Cmdline.silent ()) && not quiet then "set -x\n" else "") ^
+ "\n" ^
+ code
+
and evaluate_goal_arg env = function
| Ast.EVar (loc, name) ->
let expr = Ast.getvar env loc name in
| EList (loc, exprs) ->
Ast.EList (loc, List.map (evaluate_goal_arg env) exprs)
- | ETacticCtor (loc, name, exprs) ->
- Ast.ETacticCtor (loc, name, List.map (evaluate_goal_arg env) exprs)
+ | EPredCtor (loc, name, exprs) ->
+ Ast.EPredCtor (loc, name, List.map (evaluate_goal_arg env) exprs)
| ECall (loc, name, args) ->
let expr = Ast.getvar env loc name in
| EConstant _
| EGoalDefn _
| EFuncDefn _
- | ETacticDefn _ as e -> e
+ | EPredDefn _ as e -> e
(* Functions are only called from goal args or when substituting
* into a shell script or constant expression (this may change if we
* function by running the associated shell script and parsing
* the output as an expression, string or list of strings.
*)
-and call_function env loc name args (params, returning, code) =
+and call_function env loc name args (params, returning, pure, code) =
(* This is used to print the function in debug and error messages only. *)
let debug_func =
sprintf "%s (%s) returning %s" name
(List.length params) (List.length args) in
List.fold_left (fun env (k, v) -> Ast.Env.add k v env) env params in
- let r, b = run_code env loc code in
- if r <> 0 then (
- eprintf "*** function ‘%s’ failed with exit code %d\n" name r;
- exit 1
- );
+ if pure then call_function_pure env loc name returning code
+ else call_function_really env loc name returning code
+and call_function_really env loc name returning code =
match returning with
- | RetExpr -> Parse.parse_expr (sprintf "function:%s" name) b
- | RetString -> Ast.EConstant (loc, Ast.CString b)
+ | RetExpr ->
+ let r, b = run_code_to_string env loc code in
+ if r <> 0 then
+ failwithf "function ‘%s’ failed with exit code %d" name r;
+ Parse.parse_expr (sprintf "function:%s" name) b
+
+ | RetString ->
+ let r, b = run_code_to_string env loc code in
+ if r <> 0 then
+ failwithf "function ‘%s’ failed with exit code %d" name r;
+ (* Remove a single trailing \n if present. *)
+ let b =
+ let len = String.length b in
+ if len > 0 && b.[len-1] = '\n' then String.sub b 0 (len-1) else b in
+ Ast.EConstant (loc, Ast.CString b)
+
| RetStrings ->
- (* run_code always adds \n after the final line, so when we
- * read it back we will get a final empty string which we
- * have to drop. XXX Probably better to preserve the lines
- * read from the external command.
- *)
- let strs = nsplit "\n" b in
- let strs = List.rev strs in
- let strs = match strs with "" :: xs -> xs | xs -> xs in
- let strs = List.rev strs in
- let strs = List.map (fun s -> Ast.EConstant (loc, Ast.CString s)) strs in
+ let r, lines = run_code_to_string_list env loc code in
+ let strs = List.map (fun s -> Ast.EConstant (loc, Ast.CString s)) lines in
EList (loc, strs)
+
+(* For pure functions, check if the function can be matched to
+ * a previously memoized result, but don't fail if this goes wrong.
+ *)
+and call_function_pure env loc name returning code =
+ let code_key =
+ try Some (to_shell_script env loc (fst code))
+ with Failure _ -> None in
+ match code_key with
+ | None -> call_function_really env loc name returning code
+ | Some code_key ->
+ let r =
+ try Some (Hashtbl.find pure_cache code_key)
+ with Not_found -> None in
+ match r with
+ | Some expr -> expr
+ | None ->
+ let expr = call_function_really env loc name returning code in
+ Hashtbl.add pure_cache code_key expr;
+ expr
git.annexia.org / goals.git / blobdiff