Split implementation into dependency analysis and traversal.

[goals.git] / src / main.ml

diff --git a/src/main.ml b/src/main.ml
index 62ea68a..ba4a195 100644 (file)
--- a/src/main.ml
+++ b/src/main.ml
@@ -27,8 +27,11 @@ let () =
   Parser.eval_substitute := Some Eval.substitute
 
 let main () =
+  (* Handle the command line. *)
+  let anon_vars, targets = Cmdline.parse () in
+
   (* Change directory (-C option). *)
-  Sys.chdir Cmdline.directory;
+  Sys.chdir (Cmdline.directory ());
 
   (* Create the initial environment, containing the system environment
    * and a few other standard strings.
@@ -48,12 +51,12 @@ let main () =
 
   (* Parse the prelude. *)
   let env =
-    if Cmdline.use_prelude then
+    if Cmdline.use_prelude () then
       Parse.parse_goalfile env Cmdline.prelude_gl_file
     else env in
 
   (* Parse the input file. *)
-  let env = Parse.parse_goalfile env Cmdline.input_file in
+  let env = Parse.parse_goalfile env (Cmdline.input_file ()) in
 
   (* Parse the command line assignments. *)
   let env =
@@ -61,26 +64,32 @@ let main () =
       fun env (name, expr) ->
         let expr = Parse.parse_expr "commandline" expr in
         Ast.Env.add name expr env
-    ) env Cmdline.anon_vars in
+    ) env anon_vars in
 
   (* Parse the target expressions. *)
-  let targets = List.map (Parse.parse_expr "commandline") Cmdline.targets in
+  let targets = List.map (Parse.parse_expr "commandline") targets in
 
   (* If no target was set on the command line, use "all ()". *)
   let targets =
     if targets <> [] then targets
     else [Ast.ECall (Ast.noloc, "all", [])] in
 
-  if Cmdline.debug_flag then
+  if Cmdline.debug_flag () then
     Ast.print_env stderr env;
 
-  (* Run the target expressions. *)
-  Run.run_targets_to_completion env targets
+  (* Construct the dependency DAG with the root(s) being the targets. *)
+  let dag = Deps.create env targets in
+
+  (* Run the jobs. *)
+  let state = Deps.new_state dag Run.goal_runner Run.exists_runner in
+  let next_job () = Deps.next_job state in
+  let retire_job job = Deps.retire_job state job in
+  let string_of_job job = Deps.string_of_job job in
+  Jobs.run next_job retire_job string_of_job
 
 let () =
   try main ()
   with
-    Failure msg | Sys_error msg ->
-      Run.stop_all ();
-      prerr_endline ("*** error: " ^ msg);
-      exit 1
+  | Failure msg | Sys_error msg ->
+     prerr_endline ("*** error: " ^ msg);
+     exit 1