X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/runlisp/blobdiff_plain/1dff83f1891c628ec7dab32bc4958f91fc6e9464..7e3a86038e2a2cbb48b356cb029f9de99c14ec79:/eval.lisp?ds=sidebyside diff --git a/eval.lisp b/eval.lisp index 24cd107..79e5064 100644 --- a/eval.lisp +++ b/eval.lisp @@ -37,7 +37,10 @@ (let ((*package* (find-package "COMMON-LISP-USER"))) (loop (let ((form (read in nil token))) (when (eq form token) (return)) (funcall func form))))) - (print-form (form) + (princ-form (form) + (format t "~@[~{~A~^ ~}~%~]" + (multiple-value-list (eval form)))) + (prin1-form (form) (format t "~@[~{~S~^ ~}~%~]" (multiple-value-list (eval form))))) (loop (let ((arg (pop args))) @@ -49,8 +52,11 @@ (let ((*package* (find-package "COMMON-LISP-USER"))) (#\! (push (lambda () (foreach-form #'eval rest)) list)) + (#\= (push (lambda () + (foreach-form #'princ-form rest)) + list)) (#\? (push (lambda () - (foreach-form #'print-form rest)) + (foreach-form #'prin1-form rest)) list)) (#\< (push (lambda () (load rest))