diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/step6_file.py | 3 | ||||
| -rw-r--r-- | python/step7_quote.py | 3 | ||||
| -rw-r--r-- | python/step8_macros.py | 3 | ||||
| -rw-r--r-- | python/step9_interop.py | 3 | ||||
| -rw-r--r-- | python/stepA_more.py | 3 |
5 files changed, 5 insertions, 10 deletions
diff --git a/python/step6_file.py b/python/step6_file.py index b53863a..8a3432d 100644 --- a/python/step6_file.py +++ b/python/step6_file.py @@ -88,11 +88,10 @@ for name, val in types_ns.items(): _ref(name, val) _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("(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] + '")') diff --git a/python/step7_quote.py b/python/step7_quote.py index 3054bb0..7acc322 100644 --- a/python/step7_quote.py +++ b/python/step7_quote.py @@ -105,11 +105,10 @@ for name, val in types_ns.items(): _ref(name, val) _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("(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] + '")') diff --git a/python/step8_macros.py b/python/step8_macros.py index 616e7d3..e09942c 100644 --- a/python/step8_macros.py +++ b/python/step8_macros.py @@ -125,11 +125,10 @@ for name, val in types_ns.items(): _ref(name, val) _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("(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] + '")') diff --git a/python/step9_interop.py b/python/step9_interop.py index 3a20960..b15497f 100644 --- a/python/step9_interop.py +++ b/python/step9_interop.py @@ -134,11 +134,10 @@ for name, val in types_ns.items(): _ref(name, val) _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("(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] + '")') 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] + '")') |