X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=src%2Fmain.ml;h=6546fd5b70e1fb5b09f89f880a27a9eaf00b0d98;hb=eb96a7b791ac414a861a31e93e3336924daaecbe;hp=643e1b5ff33e37b2e7394ec413abb307d214f812;hpb=ad88d061677bc17e820eac0f949723c6f3d4f6e4;p=goals.git

diff --git a/src/main.ml b/src/main.ml
index 643e1b5..6546fd5 100644
--- a/src/main.ml
+++ b/src/main.ml
@@ -19,64 +19,44 @@
 
 open Printf
 
-open Utils
-
-let usage =
-  "\
-goals: Build software.
-
- goals [-f Goalfile] ['var = value' ...] ['target' ...]
-
-For detailed help see goals(1).
-
-Options:"
-
 let main () =
-  (* Command line arguments. *)
-  let filename = ref "Goalfile" in
-
-  let argspec = [
-    "-f",        Arg.Set_string filename,
-                 "filename Set name of Goalfile";
-    "--file",    Arg.Set_string filename,
-                 "filename Set name of Goalfile";
-  ] in
-  let argspec = Arg.align argspec in
-  let args = ref [] in
-  let anon_fun s = args := s :: !args in
-  Arg.parse argspec anon_fun usage;
+  (* Change directory (-C option). *)
+  Sys.chdir Cmdline.directory;
 
-  (*let args = List.rev !args in*)
-  let filename = !filename in
+  (* Parse the prelude. *)
+  let env =
+    if Cmdline.use_prelude then
+      Parse.parse_goalfile Ast.Env.empty Cmdline.prelude_file
+    else
+      Ast.Env.empty in
 
   (* Parse the input file. *)
-  let file = Parse.parse_from_file filename in
-
-  Ast.print_file stdout file;
-
-  (* Find the target(s) to execute first. *)
-  let initial_targets = ref [] in
-  (* XXX Parse command line anon args here. XXX *)
-
-  (* If no initial target set on the command line, find
-   * the first goal in the file.
-   *)
-  List.iter (
-    function
-    | Ast.Goal (name, [], _, _, _) ->
-       if !initial_targets = [] then
-         initial_targets := name :: !initial_targets
-    | Ast.Goal (name, _, _, _, _) ->
-       if !initial_targets = [] then
-         failwithf "%s: first target ‘%s’ has parameters and so cannot be used as the default target"
-           filename name
-    | _ -> ()
-  ) file;
-
-  let initial_targets = List.rev !initial_targets in
-
-  eprintf "initial targets:";
-  List.iter (eprintf " %s") initial_targets;
-  eprintf "\n"
-
-let () = main ()
+  let env = Parse.parse_goalfile env Cmdline.input_file in
+
+  (* Parse the command line assignments. *)
+  let env =
+    List.fold_left (
+      fun env (name, expr) ->
+        let expr = Parse.parse_cli_expr expr in
+        Ast.Env.add name expr env
+    ) env Cmdline.anon_vars in
+
+  (* Parse the target expressions. *)
+  let targets = List.map Parse.parse_cli_expr Cmdline.targets in
+
+  (* If no target was set on the command line, use "all ()". *)
+  let targets =
+    if targets <> [] then targets
+    else [Ast.ECallGoal (Ast.noloc, "all", [])] in
+
+  if Cmdline.debug_flag then
+    Ast.print_env stderr env;
+
+  (* Evaluate the target expressions in turn. *)
+  Eval.evaluate_targets env targets
+
+let () =
+  try main ()
+  with
+    Failure msg | Sys_error msg ->
+      prerr_endline ("error: " ^ msg); exit 1