More improved error locs (#948)

babashka · Oct 17, 2024 · 50f97f7 · 50f97f7
1 parent f77f1d2
commit 50f97f7
Show file tree

Hide file tree

Showing 3 changed files with 984 additions and 966 deletions.
diff --git a/src/sci/impl/fns.cljc b/src/sci/impl/fns.cljc
@@ -146,7 +146,7 @@
 
 (defn ^{:private true}
   maybe-destructured
-  [params body]
+  [params body loc]
   (if (every? symbol? params)
     (cons params body)
     (loop [params params
@@ -159,8 +159,10 @@
             (recur (next params) (conj new-params gparam)
                    (-> lets (conj (first params)) (conj gparam)))))
         `(~new-params
-          (let ~lets
-            ~@body))))))
+          ~(with-meta
+             `(let ~lets
+                ~@body)
+             loc))))))
 
 (defn fn**
   [form _ & sigs]
@@ -176,7 +178,7 @@
                     (str "Parameter declaration "
                          (first sigs)
                          " should be a vector")
-                    (str "Parameter declaration missing"))
+                    "Parameter declaration missing")
                   form)))
         psig (fn* [sig]
                   ;; Ensure correct type before destructuring sig
@@ -211,7 +213,7 @@
                                (concat (map (fn* [c] `(assert ~c)) pre)
                                        body)
                                body)]
-                    (maybe-destructured params body)))
+                    (maybe-destructured params body (meta form))))
         new-sigs (map psig sigs)
         expr (with-meta
                (if name