From 666179df6d54ec5413f44c7002982ccb6c2c4732 Mon Sep 17 00:00:00 2001 From: mryouse Date: Sun, 10 Jul 2022 20:34:19 +0000 Subject: bugfix: definitions weren't registering (falling out of env) --- repl.neb | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'repl.neb') diff --git a/repl.neb b/repl.neb index e8cb9b5..c661716 100644 --- a/repl.neb +++ b/repl.neb @@ -26,18 +26,22 @@ (print "version: < 0") (def next-cmd-num 1) - (func evaluate-cmd (cmd) - (def evaluated (parse-neb cmd)) - (print (concat "=> " (->string evaluated))) - (redef next-cmd-num (+ 1 next-cmd-num)) - (redef _history_ (append _history_ cmd))) + + (func get-non-empty-input () + (def tmp "") + (while (eq? "" tmp) + (redef tmp (strip (read-line (prompt next-cmd-num))))) + tmp) ; this is the actual loop part (while #true - (def this-cmd (strip (read-line (prompt next-cmd-num)))) - (if (not (eq? "" this-cmd)) + (def this-cmd (get-non-empty-input)) + (def evaluated (try - (evaluate-cmd this-cmd) - (print (concat "panic! " _panic_)))))) + (eval (parse-neb this-cmd)) + _panic_)) + (print (concat "=> " (->string evaluated))) + (redef next-cmd-num (+ 1 next-cmd-num)) + (redef _history_ (append _history_ this-cmd)))) (repl) -- cgit v1.2.3 From a876130d9a0819f13998b2eb591df7e0726dba25 Mon Sep 17 00:00:00 2001 From: mryouse Date: Sun, 10 Jul 2022 20:41:54 +0000 Subject: bugfix: panics shouldn't increment or be included in history --- repl.neb | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'repl.neb') diff --git a/repl.neb b/repl.neb index c661716..77faed6 100644 --- a/repl.neb +++ b/repl.neb @@ -36,12 +36,18 @@ ; this is the actual loop part (while #true (def this-cmd (get-non-empty-input)) + (def panicked #false) ; we may not need this two-step if there's a :panic type (def evaluated (try (eval (parse-neb this-cmd)) - _panic_)) - (print (concat "=> " (->string evaluated))) - (redef next-cmd-num (+ 1 next-cmd-num)) - (redef _history_ (append _history_ this-cmd)))) + (block + (redef panicked #true) + _panic_))) + (if panicked + (print (concat "panic! " evaluated)) + (block + (print (concat "=> " (->string evaluated))) + (redef next-cmd-num (+ 1 next-cmd-num)) + (redef _history_ (append _history_ this-cmd)))))) (repl) -- cgit v1.2.3 From 9226c0221e603668346676fffa8dc49e934882d3 Mon Sep 17 00:00:00 2001 From: mryouse Date: Sun, 10 Jul 2022 21:13:41 +0000 Subject: strings should be printed with surrounding quotes --- repl.neb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'repl.neb') diff --git a/repl.neb b/repl.neb index 77faed6..cc8ae06 100644 --- a/repl.neb +++ b/repl.neb @@ -33,6 +33,12 @@ (redef tmp (strip (read-line (prompt next-cmd-num))))) tmp) + (func print-result (res) + (print (concat "=> " + (if (eq? :string (typeof res)) + (concat "\"" res "\"") + (->string res))))) + ; this is the actual loop part (while #true (def this-cmd (get-non-empty-input)) @@ -43,10 +49,11 @@ (block (redef panicked #true) _panic_))) + (if panicked (print (concat "panic! " evaluated)) (block - (print (concat "=> " (->string evaluated))) + (print-result evaluated) (redef next-cmd-num (+ 1 next-cmd-num)) (redef _history_ (append _history_ this-cmd)))))) -- cgit v1.2.3