when-some

babashka · Oct 17, 2024 · a27c7dd · a27c7dd
1 parent 512256c
commit a27c7dd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/sci/impl/namespaces.cljc b/src/sci/impl/namespaces.cljc
@@ -203,13 +203,16 @@
        (let [~x (first xs#)]
          ~@body))))
 
-(defn when-some* [_ _ bindings & body]
-  (let [form (bindings 0) tst (bindings 1)]
-    `(let [temp# ~tst]
-       (if (nil? temp#)
+(defn when-some* [&form _ bindings & body]
+  (let [form (bindings 0) tst (bindings 1)
+        tmp (gensym "temp")]
+    `(let [~tmp ~tst]
+       (if (nil? ~tmp)
          nil
-         (let [~form temp#]
-           ~@body)))))
+         ~(with-meta
+            `(let [~form ~tmp]
+               ~@body)
+            (meta &form))))))
 
 (defn some->*
   [_&form _&env expr & forms]

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