X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=src%2Fmain.ml;h=63dac2bbfe658fd353e948133e29dfc9ed26ddd3;hb=81394242a7d6a47fad6d84ce33d488d38de2647a;hp=df4fb43a07c41b0d3594e96b81629f4d9cc9d33b;hpb=a48b05d35f0646322e8178ff10f8ed7af3e739aa;p=goals.git

diff --git a/src/main.ml b/src/main.ml
index df4fb43..63dac2b 100644
--- a/src/main.ml
+++ b/src/main.ml
@@ -19,6 +19,8 @@
 
 open Printf
 
+open Utils
+
 (* See comment in parser.mly. *)
 let () =
   Parser.lexer_read := Some Lexer.read;
@@ -28,12 +30,27 @@ 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_gl_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
@@ -58,7 +75,7 @@ let main () =
     Ast.print_env stderr env;
 
   (* Run the target expressions. *)
-  Run.run_targets env targets
+  Run.run_targets_to_completion env targets
 
 let () =
   try main ()