X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=src%2Fmain.ml;h=62ea68ac239b4ac421385b1f3411fddb0c40da38;hb=60c2061059e1d1c246df02733ab570a1af662f5f;hp=6546fd5b70e1fb5b09f89f880a27a9eaf00b0d98;hpb=3a94d620b1c135342c9f88ae943f256b9a9f96c9;p=goals.git

diff --git a/src/main.ml b/src/main.ml
index 6546fd5..62ea68a 100644
--- a/src/main.ml
+++ b/src/main.ml
@@ -19,16 +19,38 @@
 
 open Printf
 
+open Utils
+
+(* See comment in parser.mly. *)
+let () =
+  Parser.lexer_read := Some Lexer.read;
+  Parser.eval_substitute := Some Eval.substitute
+
 let main () =
   (* Change directory (-C option). *)
   Sys.chdir Cmdline.directory;
 
+  (* Create the initial environment, containing the system environment
+   * and a few other standard strings.
+   *)
+  let env =
+    Array.fold_left (
+      fun env environ ->
+        let k, v = split "=" environ in
+        Ast.Env.add k (Ast.EConstant (Ast.noloc, Ast.CString v)) env
+    ) Ast.Env.empty (Unix.environment ()) in
+  let env =
+    Ast.Env.add "stdlib"
+      (Ast.EConstant (Ast.noloc, Ast.CString Cmdline.stdlibdir))
+      env in
+  (*let env =
+    if Cmdline.debug_flag then Ast.Env.add "debug" (Ast.EConstant (noloc, Ast.CBool true)) env else env 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.parse_goalfile env Cmdline.prelude_gl_file
+    else env in
 
   (* Parse the input file. *)
   let env = Parse.parse_goalfile env Cmdline.input_file in
@@ -37,26 +59,28 @@ let main () =
   let env =
     List.fold_left (
       fun env (name, expr) ->
-        let expr = Parse.parse_cli_expr expr in
+        let expr = Parse.parse_expr "commandline" 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
+  let targets = List.map (Parse.parse_expr "commandline") 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
+    else [Ast.ECall (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
+  (* Run the target expressions. *)
+  Run.run_targets_to_completion env targets
 
 let () =
   try main ()
   with
     Failure msg | Sys_error msg ->
-      prerr_endline ("error: " ^ msg); exit 1
+      Run.stop_all ();
+      prerr_endline ("*** error: " ^ msg);
+      exit 1