X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=src%2Feval.ml;h=59f4ca4dc87b4b8f299c14b1e9a2add29b04f4da;hb=109185686ffdc00520eba2b4c3a92f10a111fb60;hp=b614ddc9b823d0dc571d400d2b42e4f257f937b4;hpb=800244e4c76abb5092b1f265a1186d76cfba6f06;p=goals.git

diff --git a/src/eval.ml b/src/eval.ml
index b614ddc..59f4ca4 100644
--- a/src/eval.ml
+++ b/src/eval.ml
@@ -186,6 +186,7 @@ and run_code_to_string_list env loc code =
   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" ^
@@ -269,18 +270,14 @@ and call_function_really env loc name returning code =
   match returning with
   | RetExpr ->
      let r, b = run_code_to_string env loc code in
-     if r <> 0 then (
-       eprintf "*** function ‘%s’ failed with exit code %d\n" name r;
-       exit 1
-     );
+     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 (
-       eprintf "*** function ‘%s’ failed with exit code %d\n" name r;
-       exit 1
-     );
+     if r <> 0 then
+       failwithf "function ‘%s’ failed with exit code %d" name r;
      Ast.EConstant (loc, Ast.CString b)
 
   | RetStrings ->