wip

babashka · Oct 17, 2024 · a632d47 · a632d47
1 parent eadd17c
commit a632d47
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 22 deletions.
diff --git a/src/sci/impl/for_macro.cljc b/src/sci/impl/for_macro.cljc
@@ -76,26 +76,27 @@
                               c-sym (gensym "c")]
                           `(fn ~giter [~gxs]
                              (lazy-seq
-                              (~allowed-loop [~gxs ~gxs]
-                               (let [~gxs (seq ~gxs)]
-                                 (when ~gxs
-                                   (if (chunked-seq? ~gxs)
-                                     (let [~c-sym (chunk-first ~gxs)
-                                           size# (int (count ~c-sym))
-                                           ~gb (chunk-buffer size#)]
-                                       (if (~allowed-loop [~gi (int 0)]
-                                            (if (< ~gi size#)
-                                              ~(with-meta
-                                                 `(let [~bind (nth ~c-sym ~gi)]
-                                                    ~(do-cmod mod-pairs))
-                                                 loc)
-                                              true))
-                                         (chunk-cons
-                                          (chunk ~gb)
-                                          (~giter (chunk-rest ~gxs)))
-                                         (chunk-cons (chunk ~gb) nil)))
-                                     (let [~bind (first ~gxs)]
-                                       ~(do-mod mod-pairs))))))))))))]
+                               (~allowed-loop [~gxs ~gxs]
+                                (let [~gxs ~(with-meta `(seq ~gxs)
+                                              loc)]
+                                   (when ~gxs
+                                     (if (chunked-seq? ~gxs)
+                                       (let [~c-sym (chunk-first ~gxs)
+                                             size# (int (count ~c-sym))
+                                             ~gb (chunk-buffer size#)]
+                                         (if (~allowed-loop [~gi (int 0)]
+                                              (if (< ~gi size#)
+                                                ~(with-meta
+                                                   `(let [~bind (nth ~c-sym ~gi)]
+                                                      ~(do-cmod mod-pairs))
+                                                   loc)
+                                                true))
+                                           (chunk-cons
+                                            (chunk ~gb)
+                                            (~giter (chunk-rest ~gxs)))
+                                           (chunk-cons (chunk ~gb) nil)))
+                                       (let [~bind (first ~gxs)]
+                                         ~(do-mod mod-pairs))))))))))))]
     `(let [iter# ~(emit-bind (to-groups seq-exprs))]
        (iter# ~(second seq-exprs)))
     ))
diff --git a/test/sci/error_test.cljc b/test/sci/error_test.cljc
@@ -182,8 +182,9 @@
 
 (deftest let-test
   (doseq [[snippet [line col]]
-          [["(str (let [[a] 1] a))"      [1 6]]
-           ["(str (for [[a] [0]] :foo))" [1 6]]]]
+          [["(str (let [[a] 1] a))"       [1 6]]
+           ["(str (for [[a] [0]] :foo))"  [1 6]]
+           ["(str (for [[a] 1] (/ 1 a)))" [1 6]]]]
     (try
       (sci.core/eval-string snippet)
       (is false)