# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1467480041 0
# Node ID cfbc5d205fbdd85f50b4aa56a67067281b64c83a
# Parent  b806d22cf6657ced5304511b7ea851c0d0676b33
Add in-package option for `eval`

diff -r b806d22cf665 -r cfbc5d205fbd src/middleware/eval.lisp
--- a/src/middleware/eval.lisp	Tue Apr 12 21:25:04 2016 +0000
+++ b/src/middleware/eval.lisp	Sat Jul 02 17:20:41 2016 +0000
@@ -69,12 +69,19 @@
                                         #-sbcl "dunno"))))))
       (eval form))))
 
-(defun evaluate-forms (message forms)
+(defun parse-in-package (in-package)
+  (if (null in-package)
+    *package*
+    (find-package (read-from-string in-package))))
+
+(defun evaluate-forms (message forms &optional in-package)
   "Evaluate each form in `forms` and shuttle back the responses.
 
   `forms` can be a string, in which case the forms will be read out of it, or
   a ready-to-go list of actual forms.
 
+  `in-package` can be a package designator, or `nil` to just use `*package*`.
+
   Other middlewares (e.g. `load-file`) can use this function to evaluate things
   and send the results back to the user.
 
@@ -107,12 +114,15 @@
             (make-shuttle-thread captured-err "stderr")
             (handler-case
                 (progn
-                  (loop :for form :in (get-forms forms) :do (eval-form form))
+                  (let ((*package* (parse-in-package in-package)))
+                    (mapc #'eval-form (get-forms forms)))
                   (respond message (make-map "status" '("done"))))
               (evaluation-error (e) (error-respond e))))
         (close captured-out)
         (close captured-err)))))
 
 (define-middleware wrap-eval "eval" message
-  (evaluate-forms message (fset:lookup message "code")))
+  (evaluate-forms message
+                  (fset:lookup message "code")
+                  (fset:lookup message "in-package")))