X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.ml;h=88cd08426d798171d730cdf640e67a7454b0b121;hb=f36210fd16a8e4e4d6ecdd8825bf8b8307943472;hp=2685160dedbde5ef27ca8206f61658a647c1a76b;hpb=4d0527cd7ced1d96720e3af56da29a19551944f7;p=goals.git

diff --git a/src/main.ml b/src/main.ml
index 2685160..88cd084 100644
--- a/src/main.ml
+++ b/src/main.ml
@@ -19,92 +19,44 @@
 
 open Printf
 
-open Utils
-
-(* See also "let id" in [lexer.mll]. *)
-let var_regexp = Str.regexp "\\([a-zA-Z_][a-zA-Z0-9_]*\\)=\\(.*\\)"
-
-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_goalfile filename in
-
-  (* Parse the command line anon args.  Each parameter has the
-   * form "name=<expr>" to assign a value to a variable, or
-   * "<expr>" to indicate a target to build.
-   *)
-  let assignments = ref [] in
-  let targets = ref [] in
-  List.iter (
-    fun arg ->
-      if Str.string_match var_regexp arg 0 then ( (* assignment *)
-        let name = Str.matched_group 1 arg in
-        let expr = Parse.parse_cli_expr (Str.matched_group 2 arg) in
-        assignments := Ast.Let (name, expr) :: !assignments
-      )
-      else ( (* target *)
-        let expr = Parse.parse_cli_expr arg in
-        targets := expr :: !targets
-      )
-  ) !args;
-
-  (* If no target was set on the command line, find
-   * the first goal in the file.
-   *)
-  if !targets = [] then (
-    try
-      let first_goal =
-        List.find (function Ast.Goal _ -> true | _ -> false) file in
-      match first_goal with
-      | Ast.Goal (name, [], _, _, _) ->
-         targets := [Ast.ECall (name, [])]
-      | Ast.Goal (name, _, _, _, _) ->
-         failwithf "%s: first target ‘%s’ has parameters and so cannot be used as the default target"
-           filename name
-      | _ -> assert false
-    with
-      (* Actually this is fine.  If there are no goals we'll do nothing. *)
-      Not_found -> ()
-  );
-
-  let targets = List.rev !targets in
-
-  (* Assignments are simply treated as statements added to the end of
-   * the file (so they override earlier assignments to the same variable,
-   * if any).
-   *)
-  let file = file @ List.rev !assignments in
-
-  (* We start with an empty symbol table. *)
-  let vars = Hashtbl.create 13 in
-
-  (* Evaluate the target expressions in turn. *)
-  Eval.evaluate file vars targets
-
-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;
+
+  (* Run the target expressions. *)
+  Run.run_targets env targets
+
+let () =
+  try main ()
+  with
+    Failure msg | Sys_error msg ->
+      prerr_endline ("error: " ^ msg); exit 1