diff options
| author | Joel Martin <github@martintribe.org> | 2014-04-01 23:12:33 -0500 |
|---|---|---|
| committer | Joel Martin <github@martintribe.org> | 2014-04-01 23:12:33 -0500 |
| commit | 1617910ad342a55762f3ddabb975849d843cff85 (patch) | |
| tree | 7d5ec5c3865370fa3cf477b772a79a7b9c6dc109 /python/stepA_more.py | |
| parent | 7e872ecfc0b00c3675d64b748a5f1e8754c85b7e (diff) | |
| download | mal-1617910ad342a55762f3ddabb975849d843cff85.tar.gz mal-1617910ad342a55762f3ddabb975849d843cff85.zip | |
All: remove slurp-do, use str around slurp instead.
Diffstat (limited to 'python/stepA_more.py')
| -rw-r--r-- | python/stepA_more.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/python/stepA_more.py b/python/stepA_more.py index c0c5004..1fda4e3 100644 --- a/python/stepA_more.py +++ b/python/stepA_more.py @@ -146,13 +146,12 @@ _ref('readline', lambda prompt: mal_readline.readline(prompt)) _ref('read-string', read_str) _ref('eval', lambda ast: EVAL(ast, repl_env)) _ref('slurp', lambda file: open(file).read()) -_ref('slurp-do', lambda file: "(do" + open(file).read() + ")") # Defined using the language itself REP("(def! not (fn* (a) (if a false true)))") 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))))))))") -REP("(def! load-file (fn* (f) (eval (read-string (slurp-do f)))))") +REP("(def! load-file (fn* (f) (eval (read-string (str \"(do \" (slurp f) \")\")))))") if len(sys.argv) >= 2: REP('(load-file "' + sys.argv[1] + '")') |