All: move some fns to core. Major cleanup.

- Don't import/require core until step4.
- Define cond/or macros from step8

1 files changed, 4 insertions, 0 deletions

diff --git a/ps/core.ps b/ps/core.ps
index 34e846e..f9397fa 100644
--- a/ps/core.ps
+++ b/ps/core.ps
@@ -223,10 +223,14 @@ end } def
     (true?)   { 0 _nth _true? }
     (false?)  { 0 _nth _false? }
     (symbol?) { 0 _nth _symbol? }
+
     (pr-str)  { /data get ( ) true _pr_str_args }
     (str)     { /data get () false _pr_str_args }
     (prn)     { /data get ( ) true _pr_str_args print (\n) print null }
     (println) { /data get ( ) false _pr_str_args print (\n) print null }
+    (readline) { 0 _nth _readline not { pop null } if }
+    (read-string) { 0 _nth read_str }
+    (slurp)   { 0 _nth (r) file dup bytesavailable string readstring pop }
     (<)       { dup 0 _nth exch 1 _nth lt }
     (<=)      { dup 0 _nth exch 1 _nth le }
     (>)       { dup 0 _nth exch 1 _nth gt }