Merge pull request #440 from aasimk2000/add-nil-if-test

[jackhill/mal.git] / vb / step8_macros.vb

diff --git a/vb/step8_macros.vb b/vb/step8_macros.vb
index 1e977ae..a07d072 100644 (file)
--- a/vb/step8_macros.vb
+++ b/vb/step8_macros.vb
@@ -252,9 +252,8 @@ Namespace Mal
 
             ' 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)))))))")
-            REP("(defmacro! or (fn* (& xs) (if (empty? xs) nil (if (= 1 (count xs)) (first xs) `(let* (or_FIXME ~(first xs)) (if or_FIXME or_FIXME (or ~@(rest xs))))))))")
 
             If args.Length > fileIdx Then
                 REP("(load-file """ & args(fileIdx) & """)")