X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.ml;h=33d91b6e6c7a048c823fd1dae38921314ef2b0f7;hb=24cc20b33e3d81ed7d754391bef929276c1f4f42;hp=b95d1f5f8ce20a61d01330784a7309c50834b1fe;hpb=318cea9f1c7669d23d27fc362bf06b9aca1b61a1;p=goals.git

diff --git a/src/main.ml b/src/main.ml
index b95d1f5..33d91b6 100644
--- 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
-        env := Ast.StringMap.add name expr !env
+        env := Ast.Env.add name expr !env
       )
       else (
         (* target *)
@@ -92,9 +92,12 @@ let main () =
     if targets <> [] then targets
     else [Ast.ECall (Ast.noloc, "all", [])] in
 
-  Ast.print_env stdout env;
+  Ast.print_env stderr env;
 
   (* Evaluate the target expressions in turn. *)
   Eval.evaluate_targets env targets
 
-let () = main ()
+let () =
+  try main ()
+  with
+    Failure msg -> prerr_endline msg; exit 1