Fix babashka/babashka#413

babashka · May 5, 2020 · 438ec15 · 438ec15
1 parent cc743d7
commit 438ec15
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/sci/impl/destructure.cljc b/src/sci/impl/destructure.cljc
@@ -91,7 +91,11 @@
                                               :cljs (implements? INamed bb))
                                          (with-meta (symbol nil (name bb)) (meta bb))
                                          bb)
-                                 bk (if (symbol? bk) (list 'quote bk) bk)
+                                 ;; if bk has metadata (:line, :column, etc)
+                                 ;; then it's a binding that needs eval
+                                 bk (if-not (meta bk)
+                                      (list 'quote bk)
+                                      bk)
                                  bv (if-let [default (get defaults local)]
                                       (mark-eval-call (list get gmap bk default))
                                       (mark-eval-call (list get gmap bk)))]

diff --git a/test/sci/core_test.cljc b/test/sci/core_test.cljc
@@ -96,6 +96,7 @@
 (deftest destructure-test
   (is (= 1 (eval* nil "(let [{:keys [a]} {:a 1}] a)")))
   (is (= 1 (eval* nil "(let [{:keys [:a]} {:a 1}] a)")))
+  (is (= 42 (eval* nil "(let [k 'foo, a-map {k 42}, {foo-val k} a-map] foo-val)")))
   (is (= 1 (eval* nil "((fn [{:keys [a]}] a) {:a 1})")))
   (is (= 1 (eval* nil "((fn [{:keys [:a]}] a) {:a 1})")))
   (is (= 1 (eval* nil "((fn [{:person/keys [id]}] id) {:person/id 1})")))