From 77f9b77c4f58dc4f149050e1d4a0ee36f91d8493 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 6 Jan 2020 12:53:15 +0000
Subject: [PATCH] Copy system environment into initial env, and also add
 %stdlib.

---
 TODO          |  3 ---
 src/main.ml   | 23 ++++++++++++++++++++---
 src/utils.mli |  6 ++++++
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/TODO b/TODO
index 45b1880..4d74fe3 100644
--- a/TODO
+++ b/TODO
@@ -43,6 +43,3 @@ Functions returning plain strings and lists of strings.
 function (foo, bar) returning string = { echo hello }
 function (foo, bar) returning strings = { echo hello; echo goodbye }
 Then re-add the sort function.
-
-Should the environment be populated by the actual environment, eg:
-let homedir = "%HOME"
diff --git a/src/main.ml b/src/main.ml
index df4fb43..2b74a4f 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
diff --git a/src/utils.mli b/src/utils.mli
index bbb8670..8edfaae 100644
--- a/src/utils.mli
+++ b/src/utils.mli
@@ -35,6 +35,12 @@ val string_find : string -> string -> int
 (** [string_find str sub] finds the index of [sub] in [str].  If
     not found, returns -1. *)
 
+val split : string -> string -> string * string
+(** [split sep str] splits [str] at the first occurrence of the
+    separator [sep], returning the part before and the part after.
+    If separator is not found, return the whole string and an
+    empty string. *)
+
 val nsplit : ?max:int -> string -> string -> string list
 (** [nsplit ?max sep str] splits [str] into multiple strings at each
     separator [sep].
-- 
1.8.3.1