lock

babashka · Oct 17, 2024 · fa7a275 · fa7a275
1 parent edefa18
commit fa7a275
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/sci/impl/namespaces.cljc b/src/sci/impl/namespaces.cljc
@@ -165,12 +165,14 @@
 (defn if-let*
   ([&form &env bindings then]
    (if-let* &form &env bindings then nil))
-  ([_&form _&env bindings then else & _oldform]
-   (let [form (bindings 0) tst (bindings 1)]
-     `(let [temp# ~tst]
-        (if temp#
-          (let [~form temp#]
-            ~then)
+  ([&form _&env bindings then else & _oldform]
+   (let [form (bindings 0) tst (bindings 1)
+         tmp (gensym "temp")]
+     `(let [~tmp ~tst]
+        (if ~tmp
+          ~(with-meta `(let [~form ~tmp]
+                         ~then)
+             (meta &form))
           ~else)))))
 
 (defn if-some*

diff --git a/test/sci/error_test.cljc b/test/sci/error_test.cljc
@@ -185,7 +185,8 @@
           [["(str (let [[a] 1] a))"        [1 6]]
            ["(str (for [[a] [0]] :foo))"   [1 6]]
            ["(str (for [[a] 1] (/ 1 a)))"  [1 6]]
-           ["(str (map (fn [[a]] a) [0]))" [1 11]] ]]
+           ["(str (map (fn [[a]] a) [0]))" [1 11]]
+           ["(str (if-let [[a] 0] a))"     [1 6]]]]
     (try
       (sci.core/eval-string snippet)
       (is false)