git.annexia.org
/
goals.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Factor out param_decl and improvements to AST printing.
[goals.git]
/
src
/
main.ml
diff --git
a/src/main.ml
b/src/main.ml
index
b95d1f5
..
33d91b6
100644
(file)
--- a/
src/main.ml
+++ b/
src/main.ml
@@
-77,7
+77,7
@@
let main () =
(* assignment *)
let name = Str.matched_group 1 arg in
let expr = Parse.parse_cli_expr (Str.matched_group 2 arg) in
(* assignment *)
let name = Str.matched_group 1 arg in
let expr = Parse.parse_cli_expr (Str.matched_group 2 arg) in
- env := Ast.
StringMap
.add name expr !env
+ env := Ast.
Env
.add name expr !env
)
else (
(* target *)
)
else (
(* target *)
@@
-92,9
+92,12
@@
let main () =
if targets <> [] then targets
else [Ast.ECall (Ast.noloc, "all", [])] in
if targets <> [] then targets
else [Ast.ECall (Ast.noloc, "all", [])] in
- Ast.print_env std
out
env;
+ Ast.print_env std
err
env;
(* Evaluate the target expressions in turn. *)
Eval.evaluate_targets env targets
(* Evaluate the target expressions in turn. *)
Eval.evaluate_targets env targets
-let () = main ()
+let () =
+ try main ()
+ with
+ Failure msg -> prerr_endline msg; exit 1