load-file: accept empty file or final comment, return nil

Let `load-file` append a new line in case last line contains a
comment.

Also append `nil` so that the return value is predictible. Remove the
existing explicit `nil` from existing sources.

Adapt documentation and tests.

ada.2/step6_file.adb

@@ -266,7 +266,7 @@ procedure Step6_File is
    Startup : constant String
      := "(def! not (fn* (a) (if a false true)))"
      & "(def! load-file (fn* (f)"
-     & "  (eval (read-string (str ""(do "" (slurp f) "")"")))))";
+     & "  (eval (read-string (str ""(do "" (slurp f) ""\nnil)"")))))";
    Repl : constant Envs.Ptr := Envs.New_Env;
    function Eval_Builtin (Args : in Types.T_Array) return Types.T is
    begin

ada.2/step7_quote.adb

@@ -346,7 +346,7 @@ procedure Step7_Quote is
    Startup : constant String
      := "(def! not (fn* (a) (if a false true)))"
      & "(def! load-file (fn* (f)"
-     & "  (eval (read-string (str ""(do "" (slurp f) "")"")))))";
+     & "  (eval (read-string (str ""(do "" (slurp f) ""\nnil)"")))))";
    Repl : constant Envs.Ptr := Envs.New_Env;
    function Eval_Builtin (Args : in Types.T_Array) return Types.T is
    begin

ada.2/step8_macros.adb

@@ -395,7 +395,7 @@ procedure Step8_Macros is
    Startup : constant String
      := "(def! not (fn* (a) (if a false true)))"
      & "(def! load-file (fn* (f)"
-     & "  (eval (read-string (str ""(do "" (slurp f) "")"")))))"
+     & "  (eval (read-string (str ""(do "" (slurp f) ""\nnil)"")))))"
      & "(defmacro! cond (fn* (& xs)"
      & "  (if (> (count xs) 0)"
      & "    (list 'if (first xs)"

ada.2/step9_try.adb

@@ -425,7 +425,7 @@ procedure Step9_Try is
    Startup : constant String
      := "(def! not (fn* (a) (if a false true)))"
      & "(def! load-file (fn* (f)"
-     & "  (eval (read-string (str ""(do "" (slurp f) "")"")))))"
+     & "  (eval (read-string (str ""(do "" (slurp f) ""\nnil)"")))))"
      & "(defmacro! cond (fn* (& xs)"
      & "  (if (> (count xs) 0)"
      & "    (list 'if (first xs)"

ada.2/stepa_mal.adb

@@ -431,7 +431,7 @@ procedure StepA_Mal is
    Startup : constant String
      := "(def! not (fn* (a) (if a false true)))"
      & "(def! load-file (fn* (f)"
-     & "  (eval (read-string (str ""(do "" (slurp f) "")"")))))"
+     & "  (eval (read-string (str ""(do "" (slurp f) ""\nnil)"")))))"
      & "(defmacro! cond (fn* (& xs)"
      & "  (if (> (count xs) 0)"
      & "    (list 'if (first xs)"

ada/step6_file.adb

@@ -358,7 +358,7 @@ begin
    Envs.Set (Repl_Env, "eval", New_Func_Mal_Type ("eval", Do_Eval'Unrestricted_Access));
 
    RE ("(def! not (fn* (a) (if a false true)))");
-   RE ("(def! load-file (fn* (f) (eval (read-string (str ""(do "" (slurp f) "")"")))))");
+   RE ("(def! load-file (fn* (f) (eval (read-string (str ""(do "" (slurp f) ""\nnil)"")))))");
 
    -- Command line processing.
 

ada/step7_quote.adb

@@ -449,7 +449,7 @@ begin
    Envs.Set (Repl_Env, "eval", New_Func_Mal_Type ("eval", Do_Eval'Unrestricted_Access));
 
    RE ("(def! not (fn* (a) (if a false true)))");
-   RE ("(def! load-file (fn* (f) (eval (read-string (str ""(do "" (slurp f) "")"")))))");
+   RE ("(def! load-file (fn* (f) (eval (read-string (str ""(do "" (slurp f) ""\nnil)"")))))");
 
    -- Command line processing.
 

ada/step8_macros.adb

@@ -525,7 +525,7 @@ begin
    Envs.Set (Repl_Env, "eval", New_Func_Mal_Type ("eval", Do_Eval'Unrestricted_Access));
 
    RE ("(def! not (fn* (a) (if a false true)))");
-   RE ("(def! load-file (fn* (f) (eval (read-string (str ""(do "" (slurp f) "")"")))))");
+   RE ("(def! load-file (fn* (f) (eval (read-string (str ""(do "" (slurp f) ""\nnil)"")))))");
    RE ("(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw ""odd number of forms to cond"")) (cons 'cond (rest (rest xs)))))))");
 
    -- Command line processing.

ada/step9_try.adb

@@ -578,7 +578,7 @@ begin
    Envs.Set (Repl_Env, "eval", New_Func_Mal_Type ("eval", Do_Eval'Unrestricted_Access));
 
    RE ("(def! not (fn* (a) (if a false true)))");
-   RE ("(def! load-file (fn* (f) (eval (read-string (str ""(do "" (slurp f) "")"")))))");
+   RE ("(def! load-file (fn* (f) (eval (read-string (str ""(do "" (slurp f) ""\nnil)"")))))");
    RE ("(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw ""odd number of forms to cond"")) (cons 'cond (rest (rest xs)))))))");
 
    -- Command line processing.

ada/stepa_mal.adb

@@ -578,7 +578,7 @@ begin
    Envs.Set (Repl_Env, "eval", New_Func_Mal_Type ("eval", Do_Eval'Unrestricted_Access));
 
    RE ("(def! not (fn* (a) (if a false true)))");
-   RE ("(def! load-file (fn* (f) (eval (read-string (str ""(do "" (slurp f) "")"")))))");
+   RE ("(def! load-file (fn* (f) (eval (read-string (str ""(do "" (slurp f) ""\nnil)"")))))");
    RE ("(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw ""odd number of forms to cond"")) (cons 'cond (rest (rest xs)))))))");
 
    -- Command line processing.

awk/step6_file.awk

@@ -325,7 +325,7 @@ function main(str, ret, i, idx)
 	env_set(repl_env, "'eval", "&eval")
 
 	rep("(def! not (fn* (a) (if a false true)))")
-	rep("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))")
+	rep("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\\nnil)\")))))")
 
 	idx = types_allocate()
 	env_set(repl_env, "'*ARGV*", "(" idx)

awk/step7_quote.awk

@@ -415,7 +415,7 @@ function main(str, ret, i, idx)
 	env_set(repl_env, "'eval", "&eval")
 
 	rep("(def! not (fn* (a) (if a false true)))")
-	rep("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))")
+	rep("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\\nnil)\")))))")
 
 	idx = types_allocate()
 	env_set(repl_env, "'*ARGV*", "(" idx)

awk/step8_macros.awk

@@ -505,7 +505,7 @@ function main(str, ret, i, idx)
 	env_set(repl_env, "'eval", "&eval")
 
 	rep("(def! not (fn* (a) (if a false true)))")
-	rep("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))")
+	rep("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\\nnil)\")))))")
 	rep("(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))")
 
 	idx = types_allocate()

awk/step9_try.awk

@@ -567,7 +567,7 @@ function main(str, ret, i, idx)
 	env_set(repl_env, "'eval", "&eval")
 
 	rep("(def! not (fn* (a) (if a false true)))")
-	rep("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))")
+	rep("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\\nnil)\")))))")
 	rep("(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))")
 
 	idx = types_allocate()

awk/stepA_mal.awk

@@ -570,7 +570,7 @@ function main(str, ret, i, idx)
 
 	rep("(def! *host-language* \"GNU awk\")")
 	rep("(def! not (fn* (a) (if a false true)))")
-	rep("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))")
+	rep("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\\nnil)\")))))")
 	rep("(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))")
 
 	idx = types_allocate()

bash/step6_file.sh

@@ -161,7 +161,7 @@ ENV_SET "${REPL_ENV}" "${r}" "${argv}";
 
 # core.mal: defined using the language itself
 REP "(def! not (fn* (a) (if a false true)))"
-REP "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))"
+REP "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))"
 
 # load/run file from command line (then exit)
 if [[ "${1}" ]]; then

bash/step7_quote.sh

@@ -206,7 +206,7 @@ ENV_SET "${REPL_ENV}" "${r}" "${argv}";
 
 # core.mal: defined using the language itself
 REP "(def! not (fn* (a) (if a false true)))"
-REP "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))"
+REP "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))"
 
 # load/run file from command line (then exit)
 if [[ "${1}" ]]; then

bash/step8_macros.sh

@@ -248,7 +248,7 @@ ENV_SET "${REPL_ENV}" "${r}" "${argv}";
 
 # core.mal: defined using the language itself
 REP "(def! not (fn* (a) (if a false true)))"
-REP "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))"
+REP "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))"
 REP "(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))"
 
 # load/run file from command line (then exit)

bash/step9_try.sh

@@ -261,7 +261,7 @@ ENV_SET "${REPL_ENV}" "${r}" "${argv}";
 
 # core.mal: defined using the language itself
 REP "(def! not (fn* (a) (if a false true)))"
-REP "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))"
+REP "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))"
 REP "(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))"
 
 # load/run file from command line (then exit)

bash/stepA_mal.sh

@@ -270,7 +270,7 @@ ENV_SET "${REPL_ENV}" "${r}" "${argv}";
 # core.mal: defined using the language itself
 REP "(def! *host-language* \"bash\")"
 REP "(def! not (fn* (a) (if a false true)))"
-REP "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))"
+REP "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))"
 REP "(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))"
 
 # load/run file from command line (then exit)

basic/step6_file.in.bas

@@ -372,7 +372,7 @@ MAIN:
   A$="(def! not (fn* (a) (if a false true)))"
   GOSUB RE:AY=R:GOSUB RELEASE
 
-  A$="(def! load-file (fn* (f) (eval (read-file f))))"
+  A$="(def! load-file (fn* (f) (do (eval (read-file f)) nil)))"
   GOSUB RE:AY=R:GOSUB RELEASE
 
   REM load the args file

basic/step7_quote.in.bas

@@ -462,7 +462,7 @@ MAIN:
   A$="(def! not (fn* (a) (if a false true)))"
   GOSUB RE:AY=R:GOSUB RELEASE
 
-  A$="(def! load-file (fn* (f) (eval (read-file f))))"
+  A$="(def! load-file (fn* (f) (do (eval (read-file f)) nil)))"
   GOSUB RE:AY=R:GOSUB RELEASE
 
   REM load the args file

basic/step8_macros.in.bas

@@ -529,7 +529,7 @@ MAIN:
   A$="(def! not (fn* (a) (if a false true)))"
   GOSUB RE:AY=R:GOSUB RELEASE
 
-  A$="(def! load-file (fn* (f) (eval (read-file f))))"
+  A$="(def! load-file (fn* (f) (do (eval (read-file f)) nil)))"
   GOSUB RE:AY=R:GOSUB RELEASE
 
   A$="(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs)"

basic/step9_try.in.bas

@@ -562,7 +562,7 @@ MAIN:
   A$="(def! not (fn* (a) (if a false true)))"
   GOSUB RE:AY=R:GOSUB RELEASE
 
-  A$="(def! load-file (fn* (f) (eval (read-file f))))"
+  A$="(def! load-file (fn* (f) (do (eval (read-file f)) nil)))"
   GOSUB RE:AY=R:GOSUB RELEASE
 
   A$="(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs)"

basic/stepA_mal.in.bas

@@ -561,7 +561,7 @@ MAIN:
   A$="(def! not (fn* (a) (if a false true)))"
   GOSUB RE:AY=R:GOSUB RELEASE
 
-  A$="(def! load-file (fn* (f) (eval (read-file f))))"
+  A$="(def! load-file (fn* (f) (do (eval (read-file f)) nil)))"
   GOSUB RE:AY=R:GOSUB RELEASE
 
   A$="(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs)"

bbc-basic/step6_file.bbc

@@ -20,7 +20,7 @@ UNTIL sym$ = ""
 REM  Initial forms to evaluate
 RESTORE +0
 DATA (def! not (fn* (a) (if a false true)))
-DATA (def! load-file (fn* (f) (eval (read-string (str "(do " (slurp f) ")")))))
+DATA (def! load-file (fn* (f) (eval (read-string (str "(do " (slurp f) "\nnil)")))))
 DATA ""
 REPEAT
   READ form$

bbc-basic/step7_quote.bbc

@@ -20,7 +20,7 @@ UNTIL sym$ = ""
 REM  Initial forms to evaluate
 RESTORE +0
 DATA (def! not (fn* (a) (if a false true)))
-DATA (def! load-file (fn* (f) (eval (read-string (str "(do " (slurp f) ")")))))
+DATA (def! load-file (fn* (f) (eval (read-string (str "(do " (slurp f) "\nnil)")))))
 DATA ""
 REPEAT
   READ form$

bbc-basic/step8_macros.bbc

@@ -20,7 +20,7 @@ UNTIL sym$ = ""
 REM  Initial forms to evaluate
 RESTORE +0
 DATA (def! not (fn* (a) (if a false true)))
-DATA (def! load-file (fn* (f) (eval (read-string (str "(do " (slurp f) ")")))))
+DATA (def! load-file (fn* (f) (eval (read-string (str "(do " (slurp f) "\nnil)")))))
 DATA (defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw "odd number of forms to cond")) (cons 'cond (rest (rest xs)))))))
 DATA ""
 REPEAT

bbc-basic/step9_try.bbc

@@ -20,7 +20,7 @@ UNTIL sym$ = ""
 REM  Initial forms to evaluate
 RESTORE +0
 DATA (def! not (fn* (a) (if a false true)))
-DATA (def! load-file (fn* (f) (eval (read-string (str "(do " (slurp f) ")")))))
+DATA (def! load-file (fn* (f) (eval (read-string (str "(do " (slurp f) "\nnil)")))))
 DATA (defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw "odd number of forms to cond")) (cons 'cond (rest (rest xs)))))))
 DATA ""
 REPEAT

bbc-basic/stepA_mal.bbc

@@ -20,7 +20,7 @@ UNTIL sym$ = ""
 REM  Initial forms to evaluate
 RESTORE +0
 DATA (def! not (fn* (a) (if a false true)))
-DATA (def! load-file (fn* (f) (eval (read-string (str "(do " (slurp f) ")")))))
+DATA (def! load-file (fn* (f) (eval (read-string (str "(do " (slurp f) "\nnil)")))))
 DATA (defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw "odd number of forms to cond")) (cons 'cond (rest (rest xs)))))))
 DATA (def! *host-language* "BBC BASIC V")
 DATA ""

c/step6_file.c

@@ -210,7 +210,7 @@ void init_repl_env(int argc, char *argv[]) {
     // core.mal: defined using the language itself
     RE(repl_env, "", "(def! not (fn* (a) (if a false true)))");
     RE(repl_env, "",
-       "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))");
+       "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))");
 }
 
 int main(int argc, char *argv[])

c/step7_quote.c

@@ -247,7 +247,7 @@ void init_repl_env(int argc, char *argv[]) {
     // core.mal: defined using the language itself
     RE(repl_env, "", "(def! not (fn* (a) (if a false true)))");
     RE(repl_env, "",
-       "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))");
+       "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))");
 }
 
 int main(int argc, char *argv[])

c/step8_macros.c

@@ -289,7 +289,7 @@ void init_repl_env(int argc, char *argv[]) {
     // core.mal: defined using the language itself
     RE(repl_env, "", "(def! not (fn* (a) (if a false true)))");
     RE(repl_env, "",
-       "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))");
+       "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))");
     RE(repl_env, "", "(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))");
 }
 

c/step9_try.c

@@ -314,7 +314,7 @@ void init_repl_env(int argc, char *argv[]) {
     // core.mal: defined using the language itself
     RE(repl_env, "", "(def! not (fn* (a) (if a false true)))");
     RE(repl_env, "",
-       "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))");
+       "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))");
     RE(repl_env, "", "(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))");
 }
 

c/stepA_mal.c

@@ -320,7 +320,7 @@ void init_repl_env(int argc, char *argv[]) {
     RE(repl_env, "", "(def! *host-language* \"c\")");
     RE(repl_env, "", "(def! not (fn* (a) (if a false true)))");
     RE(repl_env, "",
-       "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))");
+       "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))");
     RE(repl_env, "", "(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))");
 }
 

chuck/step6_file.ck

@@ -308,7 +308,7 @@ fun string rep(string input)
 }
 
 rep("(def! not (fn* (a) (if a false true)))");
-rep("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))");
+rep("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))");
 
 fun void main()
 {

chuck/step7_quote.ck

@@ -363,7 +363,7 @@ fun string rep(string input)
 }
 
 rep("(def! not (fn* (a) (if a false true)))");
-rep("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))");
+rep("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))");
 
 fun void main()
 {

chuck/step8_macros.ck

@@ -434,7 +434,7 @@ fun string rep(string input)
 }
 
 rep("(def! not (fn* (a) (if a false true)))");
-rep("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))");
+rep("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))");
 rep("(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))");
 
 fun void main()

chuck/step9_try.ck

@@ -451,7 +451,7 @@ fun string rep(string input)
 }
 
 rep("(def! not (fn* (a) (if a false true)))");
-rep("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))");
+rep("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))");
 rep("(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))");
 
 fun void main()

chuck/stepA_mal.ck

@@ -453,7 +453,7 @@ fun string rep(string input)
 }
 
 rep("(def! not (fn* (a) (if a false true)))");
-rep("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))");
+rep("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))");
 rep("(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))");
 
 fun void main()

clojure/src/mal/step6_file.cljc

@@ -94,7 +94,7 @@
 
 ;; core.mal: defined using the language itself
 (rep "(def! not (fn* [a] (if a false true)))")
-(rep "(def! load-file (fn* [f] (eval (read-string (str \"(do \" (slurp f) \")\")))))")
+(rep "(def! load-file (fn* [f] (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))")
 
 ;; repl loop
 (defn repl-loop []

clojure/src/mal/step7_quote.cljc

@@ -117,7 +117,7 @@
 
 ;; core.mal: defined using the language itself
 (rep "(def! not (fn* [a] (if a false true)))")
-(rep "(def! load-file (fn* [f] (eval (read-string (str \"(do \" (slurp f) \")\")))))")
+(rep "(def! load-file (fn* [f] (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))")
 
 ;; repl loop
 (defn repl-loop []

clojure/src/mal/step8_macros.cljc

@@ -151,7 +151,7 @@
 
 ;; core.mal: defined using the language itself
 (rep "(def! not (fn* [a] (if a false true)))")
-(rep "(def! load-file (fn* [f] (eval (read-string (str \"(do \" (slurp f) \")\")))))")
+(rep "(def! load-file (fn* [f] (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))")
 (rep "(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))")
 
 ;; repl loop

clojure/src/mal/step9_try.cljc

@@ -168,7 +168,7 @@
 
 ;; core.mal: defined using the language itself
 (rep "(def! not (fn* [a] (if a false true)))")
-(rep "(def! load-file (fn* [f] (eval (read-string (str \"(do \" (slurp f) \")\")))))")
+(rep "(def! load-file (fn* [f] (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))")
 (rep "(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))")
 
 ;; repl loop

clojure/src/mal/stepA_mal.cljc

@@ -178,7 +178,7 @@
 #?(:clj  (rep "(def! *host-language* \"clojure\")")
    :cljs (rep "(def! *host-language* \"clojurescript\")"))
 (rep "(def! not (fn* [a] (if a false true)))")
-(rep "(def! load-file (fn* [f] (eval (read-string (str \"(do \" (slurp f) \")\")))))")
+(rep "(def! load-file (fn* [f] (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))")
 (rep "(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))")
 
 ;; repl loop

coffee/step6_file.coffee

@@ -71,7 +71,7 @@ repl_env.set types._symbol('*ARGV*'), []
 
 # core.mal: defined using the language itself
 rep("(def! not (fn* (a) (if a false true)))");
-rep("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))");
+rep("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))");
 
 if process? && process.argv.length > 2
   repl_env.set types._symbol('*ARGV*'), process.argv[3..]

coffee/step7_quote.coffee

@@ -87,7 +87,7 @@ repl_env.set types._symbol('*ARGV*'), []
 
 # core.mal: defined using the language itself
 rep("(def! not (fn* (a) (if a false true)))");
-rep("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))");
+rep("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))");
 
 if process? && process.argv.length > 2
   repl_env.set types._symbol('*ARGV*'), process.argv[3..]

coffee/step8_macros.coffee

@@ -105,7 +105,7 @@ repl_env.set types._symbol('*ARGV*'), []
 
 # core.mal: defined using the language itself
 rep("(def! not (fn* (a) (if a false true)))");
-rep("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))");
+rep("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))");
 rep("(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))")
 
 if process? && process.argv.length > 2

coffee/step9_try.coffee

@@ -114,7 +114,7 @@ repl_env.set types._symbol('*ARGV*'), []
 
 # core.mal: defined using the language itself
 rep("(def! not (fn* (a) (if a false true)))");
-rep("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))");
+rep("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))");
 rep("(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))")
 
 if process? && process.argv.length > 2

coffee/stepA_mal.coffee

@@ -121,7 +121,7 @@ repl_env.set types._symbol('*ARGV*'), []
 # core.mal: defined using the language itself
 rep("(def! *host-language* \"CoffeeScript\")")
 rep("(def! not (fn* (a) (if a false true)))");
-rep("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))");
+rep("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))");
 rep("(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))")
 
 if process? && process.argv.length > 2

common-lisp/src/step6_file.lisp

@@ -135,7 +135,7 @@
                                           (mal-eval ast *repl-env*))))
 
 (rep "(def! not (fn* (a) (if a false true)))")
-(rep "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))")
+(rep "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\\nnil)\")))))")
 
 (defvar *use-readline-p* nil)
 

common-lisp/src/step7_quote.lisp

@@ -171,7 +171,7 @@
                                     (mal-eval ast *repl-env*))))
 
 (rep "(def! not (fn* (a) (if a false true)))")
-(rep "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))")
+(rep "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\\nnil)\")))))")
 
 (defvar *use-readline-p* nil)
 

common-lisp/src/step8_macros.lisp

@@ -226,7 +226,7 @@
                                     (mal-eval ast *repl-env*))))
 
 (rep "(def! not (fn* (a) (if a false true)))")
-(rep "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))")
+(rep "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\\nnil)\")))))")
 (rep "(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))")
 
 (defvar *use-readline-p* nil)

common-lisp/src/step9_try.lisp

@@ -249,7 +249,7 @@
                                     (mal-eval ast *repl-env*))))
 
 (rep "(def! not (fn* (a) (if a false true)))")
-(rep "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))")
+(rep "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\\nnil)\")))))")
 (rep "(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))")
 
 (defvar *use-readline-p* nil)

common-lisp/src/stepA_mal.lisp

@@ -256,7 +256,7 @@
              (make-mal-string (lisp-implementation-version)))
 
 (rep "(def! not (fn* (a) (if a false true)))")
-(rep "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))")
+(rep "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\\nnil)\")))))")
 (rep "(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))")
 (rep "(def! *host-language* \"common-lisp\")")
 

cpp/step6_file.cpp

@@ -177,7 +177,7 @@ malValuePtr APPLY(malValuePtr op, malValueIter argsBegin, malValueIter argsEnd)
 static const char* malFunctionTable[] = {
     "(def! not (fn* (cond) (if cond false true)))",
     "(def! load-file (fn* (filename) \
-        (eval (read-string (str \"(do \" (slurp filename) \")\")))))",
+        (eval (read-string (str \"(do \" (slurp filename) \"\nnil)\")))))",
 };
 
 static void installFunctions(malEnvPtr env) {

cpp/step7_quote.cpp

@@ -235,7 +235,7 @@ static malValuePtr quasiquote(malValuePtr obj)
 static const char* malFunctionTable[] = {
     "(def! not (fn* (cond) (if cond false true)))",
     "(def! load-file (fn* (filename) \
-        (eval (read-string (str \"(do \" (slurp filename) \")\")))))",
+        (eval (read-string (str \"(do \" (slurp filename) \"\nnil)\")))))",
 };
 
 static void installFunctions(malEnvPtr env) {

cpp/step8_macros.cpp

@@ -282,7 +282,7 @@ static const char* malFunctionTable[] = {
     "(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))",
     "(def! not (fn* (cond) (if cond false true)))",
     "(def! load-file (fn* (filename) \
-        (eval (read-string (str \"(do \" (slurp filename) \")\")))))",
+        (eval (read-string (str \"(do \" (slurp filename) \"\nnil)\")))))",
 };
 
 static void installFunctions(malEnvPtr env) {

cpp/step9_try.cpp

@@ -331,7 +331,7 @@ static const char* malFunctionTable[] = {
     "(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))",
     "(def! not (fn* (cond) (if cond false true)))",
     "(def! load-file (fn* (filename) \
-        (eval (read-string (str \"(do \" (slurp filename) \")\")))))",
+        (eval (read-string (str \"(do \" (slurp filename) \"\nnil)\")))))",
 };
 
 static void installFunctions(malEnvPtr env) {

cpp/stepA_mal.cpp

@@ -332,7 +332,7 @@ static const char* malFunctionTable[] = {
     "(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))",
     "(def! not (fn* (cond) (if cond false true)))",
     "(def! load-file (fn* (filename) \
-        (eval (read-string (str \"(do \" (slurp filename) \")\")))))",
+        (eval (read-string (str \"(do \" (slurp filename) \"\nnil)\")))))",
     "(def! *host-language* \"C++\")",
 };
 

crystal/step6_file.cr

@@ -157,7 +157,7 @@ REPL_ENV = Mal::Env.new nil
 Mal::NS.each { |k, v| REPL_ENV.set(k, Mal::Type.new(v)) }
 REPL_ENV.set("eval", Mal::Type.new ->(args : Array(Mal::Type)) { Mal.eval(args[0], REPL_ENV) })
 Mal.rep "(def! not (fn* (a) (if a false true)))"
-Mal.rep "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))"
+Mal.rep "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))"
 argv = Mal::List.new
 REPL_ENV.set("*ARGV*", Mal::Type.new argv)
 

crystal/step7_quote.cr

@@ -183,7 +183,7 @@ REPL_ENV = Mal::Env.new nil
 Mal::NS.each { |k, v| REPL_ENV.set(k, Mal::Type.new(v)) }
 REPL_ENV.set("eval", Mal::Type.new ->(args : Array(Mal::Type)) { Mal.eval(args[0], REPL_ENV) })
 Mal.rep "(def! not (fn* (a) (if a false true)))"
-Mal.rep "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))"
+Mal.rep "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))"
 argv = Mal::List.new
 REPL_ENV.set("*ARGV*", Mal::Type.new argv)
 

crystal/step8_macros.cr

@@ -229,7 +229,7 @@ REPL_ENV = Mal::Env.new nil
 Mal::NS.each { |k, v| REPL_ENV.set(k, Mal::Type.new(v)) }
 REPL_ENV.set("eval", Mal::Type.new ->(args : Array(Mal::Type)) { Mal.eval(args[0], REPL_ENV) })
 Mal.rep "(def! not (fn* (a) (if a false true)))"
-Mal.rep "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))"
+Mal.rep "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))"
 Mal.rep "(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))"
 
 argv = Mal::List.new

crystal/step9_try.cr

@@ -246,7 +246,7 @@ REPL_ENV = Mal::Env.new nil
 Mal::NS.each { |k, v| REPL_ENV.set(k, Mal::Type.new(v)) }
 REPL_ENV.set("eval", Mal::Type.new ->(args : Array(Mal::Type)) { Mal.eval(args[0], REPL_ENV) })
 Mal.rep "(def! not (fn* (a) (if a false true)))"
-Mal.rep "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))"
+Mal.rep "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))"
 Mal.rep "(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))"
 
 argv = Mal::List.new

crystal/stepA_mal.cr

@@ -252,7 +252,7 @@ REPL_ENV = Mal::Env.new nil
 Mal::NS.each { |k, v| REPL_ENV.set(k, Mal::Type.new(v)) }
 REPL_ENV.set("eval", Mal::Type.new ->(args : Array(Mal::Type)) { Mal.eval(args[0], REPL_ENV) })
 Mal.rep "(def! not (fn* (a) (if a false true)))"
-Mal.rep "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))"
+Mal.rep "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))"
 Mal.rep "(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))"
 Mal.rep("(def! *host-language* \"crystal\")")
 

cs/step6_file.cs

@@ -154,7 +154,7 @@ namespace Mal {
 
             // core.mal: defined using the language itself
             RE("(def! not (fn* (a) (if a false true)))");
-            RE("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))");
+            RE("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))");
 
             if (args.Length > fileIdx) {
                 RE("(load-file \"" + args[fileIdx] + "\")");

cs/step7_quote.cs

@@ -186,7 +186,7 @@ namespace Mal {
 
             // core.mal: defined using the language itself
             RE("(def! not (fn* (a) (if a false true)))");
-            RE("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))");
+            RE("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))");
 
             if (args.Length > fileIdx) {
                 RE("(load-file \"" + args[fileIdx] + "\")");

cs/step8_macros.cs

@@ -225,7 +225,7 @@ namespace Mal {
 
             // core.mal: defined using the language itself
             RE("(def! not (fn* (a) (if a false true)))");
-            RE("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))");
+            RE("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))");
             RE("(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))");
 
             if (args.Length > fileIdx) {

cs/step9_try.cs

@@ -246,7 +246,7 @@ namespace Mal {
 
             // core.mal: defined using the language itself
             RE("(def! not (fn* (a) (if a false true)))");
-            RE("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))");
+            RE("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))");
             RE("(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))");
 
             if (args.Length > fileIdx) {

cs/stepA_mal.cs

@@ -247,7 +247,7 @@ namespace Mal {
             // core.mal: defined using the language itself
             RE("(def! *host-language* \"c#\")");
             RE("(def! not (fn* (a) (if a false true)))");
-            RE("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))");
+            RE("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))");
             RE("(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))");
 
             if (args.Length > fileIdx) {

d/step6_file.d

@@ -178,7 +178,7 @@ void main(string[] args)
 
     // core.mal: defined using the language itself
     re("(def! not (fn* (a) (if a false true)))", repl_env);
-    re("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))", repl_env);
+    re("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))", repl_env);
 
     if (args.length > 1)
     {

d/step7_quote.d

@@ -217,7 +217,7 @@ void main(string[] args)
 
     // core.mal: defined using the language itself
     re("(def! not (fn* (a) (if a false true)))", repl_env);
-    re("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))", repl_env);
+    re("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))", repl_env);
 
     if (args.length > 1)
     {

d/step8_macros.d

@@ -261,7 +261,7 @@ void main(string[] args)
 
     // core.mal: defined using the language itself
     re("(def! not (fn* (a) (if a false true)))", repl_env);
-    re("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))", repl_env);
+    re("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))", repl_env);
     re("(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))", repl_env);
 
     if (args.length > 1)

d/step9_try.d

@@ -290,7 +290,7 @@ void main(string[] args)
 
     // core.mal: defined using the language itself
     re("(def! not (fn* (a) (if a false true)))", repl_env);
-    re("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))", repl_env);
+    re("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))", repl_env);
     re("(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))", repl_env);
 
     if (args.length > 1)

d/stepA_mal.d

@@ -292,7 +292,7 @@ void main(string[] args)
     // core.mal: defined using the language itself
     re("(def! *host-language* \"" ~ std.compiler.name ~ "\")", repl_env);
     re("(def! not (fn* (a) (if a false true)))", repl_env);
-    re("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))", repl_env);
+    re("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))", repl_env);
     re("(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))", repl_env);
 
     if (args.length > 1)

dart/step6_file.dart

@@ -20,7 +20,7 @@ void setupEnv(List<String> argv) {
 
   rep('(def! not (fn* (a) (if a false true)))');
   rep("(def! load-file "
-      "(fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))");
+      "(fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))");
 }
 
 MalType READ(String x) => reader.read_str(x);

dart/step7_quote.dart

@@ -20,7 +20,7 @@ void setupEnv(List<String> argv) {
 
   rep('(def! not (fn* (a) (if a false true)))');
   rep("(def! load-file "
-      "(fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))");
+      "(fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))");
 }
 
 MalType quasiquote(MalType ast) {

dart/step8_macros.dart

@@ -19,7 +19,7 @@ void setupEnv(List<String> argv) {
 
   rep('(def! not (fn* (a) (if a false true)))');
   rep("(def! load-file "
-      "  (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))");
+      "  (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))");
   rep("(defmacro! cond "
       "  (fn* (& xs) (if (> (count xs) 0) "
       "    (list 'if (first xs) "

dart/step9_try.dart

@@ -19,7 +19,7 @@ void setupEnv(List<String> argv) {
 
   rep('(def! not (fn* (a) (if a false true)))');
   rep("(def! load-file "
-      "  (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))");
+      "  (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))");
   rep("(defmacro! cond "
       "  (fn* (& xs) (if (> (count xs) 0) "
       "    (list 'if (first xs) "

dart/stepA_mal.dart

@@ -21,7 +21,7 @@ void setupEnv(List<String> argv) {
 
   rep('(def! not (fn* (a) (if a false true)))');
   rep("(def! load-file "
-      "  (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))");
+      "  (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))");
   rep("(defmacro! cond "
       "  (fn* (& xs) (if (> (count xs) 0) "
       "    (list 'if (first xs) "

elisp/step6_file.el

@@ -117,7 +117,7 @@
   (PRINT (EVAL (READ input) repl-env)))
 
 (rep "(def! not (fn* (a) (if a false true)))")
-(rep "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))")
+(rep "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))")
 
 (defun readln (prompt)
   ;; C-d throws an error

elisp/step7_quote.el

@@ -150,7 +150,7 @@
   (PRINT (EVAL (READ input) repl-env)))
 
 (rep "(def! not (fn* (a) (if a false true)))")
-(rep "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))")
+(rep "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))")
 
 (defun readln (prompt)
   ;; C-d throws an error

elisp/step8_macros.el

@@ -180,7 +180,7 @@
   (PRINT (EVAL (READ input) repl-env)))
 
 (rep "(def! not (fn* (a) (if a false true)))")
-(rep "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))")
+(rep "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))")
 (rep "(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))")
 
 (defun readln (prompt)

elisp/step9_try.el

@@ -196,7 +196,7 @@
   (PRINT (EVAL (READ input) repl-env)))
 
 (rep "(def! not (fn* (a) (if a false true)))")
-(rep "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))")
+(rep "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))")
 (rep "(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))")
 
 (defun readln (prompt)

elisp/stepA_mal.el

@@ -197,7 +197,7 @@
   (PRINT (EVAL (READ input) repl-env)))
 
 (rep "(def! not (fn* (a) (if a false true)))")
-(rep "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))")
+(rep "(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))")
 (rep "(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))")
 
 (defun readln (prompt)

elixir/lib/mix/tasks/step6_file.ex

@@ -27,7 +27,7 @@ defmodule Mix.Tasks.Step6File do
     read_eval_print("""
       (def! load-file
         (fn* (f)
-          (eval (read-string (str "(do " (slurp f) ")")))))
+          (eval (read-string (str "(do " (slurp f) "\nnil)")))))
       """, env)
 
     Mal.Env.set(env, "eval", %Function{value: fn [ast] ->

elixir/lib/mix/tasks/step7_quote.ex

@@ -27,7 +27,7 @@ defmodule Mix.Tasks.Step7Quote do
     read_eval_print("""
       (def! load-file
         (fn* (f)
-          (eval (read-string (str "(do " (slurp f) ")")))))
+          (eval (read-string (str "(do " (slurp f) "\nnil)")))))
       """, env)
 
     Mal.Env.set(env, "eval", %Function{value: fn [ast] ->

elixir/lib/mix/tasks/step8_macros.ex

@@ -27,7 +27,7 @@ defmodule Mix.Tasks.Step8Macros do
     read_eval_print("""
       (def! load-file
         (fn* (f)
-          (eval (read-string (str "(do " (slurp f) ")")))))
+          (eval (read-string (str "(do " (slurp f) "\nnil)")))))
       """, env)
 
     # cond

elixir/lib/mix/tasks/step9_try.ex

@@ -27,7 +27,7 @@ defmodule Mix.Tasks.Step9Try do
     read_eval_print("""
       (def! load-file
         (fn* (f)
-          (eval (read-string (str "(do " (slurp f) ")")))))
+          (eval (read-string (str "(do " (slurp f) "\nnil)")))))
       """, env)
 
     # cond

elixir/lib/mix/tasks/stepA_mal.ex

@@ -35,7 +35,7 @@ defmodule Mix.Tasks.StepAMal do
     read_eval_print("""
       (def! load-file
         (fn* (f)
-          (eval (read-string (str "(do " (slurp f) ")")))))
+          (eval (read-string (str "(do " (slurp f) "\nnil)")))))
       """, env)
 
     # cond

elm/step6_file.elm

@@ -71,7 +71,7 @@ malInit =
     , """(def! load-file
             (fn* (f)
                 (eval (read-string
-                    (str "(do " (slurp f) ")")))))"""
+                    (str "(do " (slurp f) "\nnil)")))))"""
     ]
 
 

elm/step7_quote.elm

@@ -71,7 +71,7 @@ malInit =
     , """(def! load-file
             (fn* (f)
                 (eval (read-string
-                    (str "(do " (slurp f) ")")))))"""
+                    (str "(do " (slurp f) "\nnil)")))))"""
     ]
 
 

elm/step8_macros.elm

@@ -71,7 +71,7 @@ malInit =
     , """(def! load-file
             (fn* (f)
                 (eval (read-string
-                    (str "(do " (slurp f) ")")))))"""
+                    (str "(do " (slurp f) "\nnil)")))))"""
     , """(defmacro! cond
             (fn* (& xs)
                 (if (> (count xs) 0)

elm/step9_try.elm

@@ -71,7 +71,7 @@ malInit =
     , """(def! load-file
             (fn* (f)
                 (eval (read-string
-                    (str "(do " (slurp f) ")")))))"""
+                    (str "(do " (slurp f) "\nnil)")))))"""
     , """(defmacro! cond
             (fn* (& xs)
                 (if (> (count xs) 0)

elm/stepA_mal.elm

@@ -72,7 +72,7 @@ malInit =
     , """(def! load-file
             (fn* (f)
                 (eval (read-string
-                    (str "(do " (slurp f) ")")))))"""
+                    (str "(do " (slurp f) "\nnil)")))))"""
     , """(defmacro! cond
             (fn* (& xs)
                 (if (> (count xs) 0)

erlang/src/step6_file.erl

@@ -19,7 +19,7 @@ init() ->
     Env = core:ns(),
     % define the load-file and not functions using mal itself
     eval(read("(def! not (fn* (a) (if a false true)))"), Env),
-    eval(read("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))"), Env),
+    eval(read("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))"), Env),
     Env.
 
 loop(Env) ->

erlang/src/step7_quote.erl

@@ -19,7 +19,7 @@ init() ->
     Env = core:ns(),
     % define the load-file and not functions using mal itself
     eval(read("(def! not (fn* (a) (if a false true)))"), Env),
-    eval(read("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))"), Env),
+    eval(read("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))"), Env),
     Env.
 
 loop(Env) ->

erlang/src/step8_macros.erl

@@ -18,7 +18,7 @@ main([]) ->
 init() ->
     Env = core:ns(),
     eval(read("(def! not (fn* (a) (if a false true)))"), Env),
-    eval(read("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))"), Env),
+    eval(read("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))"), Env),
     eval(read("(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))"), Env),
     Env.
 

erlang/src/step9_try.erl

@@ -18,7 +18,7 @@ main([]) ->
 init() ->
     Env = core:ns(),
     eval(read("(def! not (fn* (a) (if a false true)))"), Env),
-    eval(read("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))"), Env),
+    eval(read("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))"), Env),
     eval(read("(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))"), Env),
     Env.
 

erlang/src/stepA_mal.erl

@@ -20,7 +20,7 @@ init() ->
     Env = core:ns(),
     eval(read("(def! *host-language* \"Erlang\")"), Env),
     eval(read("(def! not (fn* (a) (if a false true)))"), Env),
-    eval(read("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))"), Env),
+    eval(read("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \"\nnil)\")))))"), Env),
     eval(read("(defmacro! cond (fn* (& xs) (if (> (count xs) 0) (list 'if (first xs) (if (> (count xs) 1) (nth xs 1) (throw \"odd number of forms to cond\")) (cons 'cond (rest (rest xs)))))))"), Env),
     Env.