Merge pull request #306 from jolt-lang/trace-source-lines

JOLT_TRACE: map tail-frame history to ns/name (file:line)

host/chez/smoke.sh

@@ -124,6 +124,21 @@ if printf '%s' "$err_stale" | grep -q 'h1'; then
 else
   pass=$((pass + 1))
 fi
+# A file-backed project run maps each runtime-compiled frame to ns/name (file:line)
+# — the eval path registers source in trace mode, so the trace isn't bare names.
+tr_proj="$(mktemp -d)"
+mkdir -p "$tr_proj/src/tp"
+printf '{:paths ["src"] :aliases {:run {:main-opts ["-m" "tp.core"]}}}\n' > "$tr_proj/deps.edn"
+printf '(ns tp.core)\n(defn deep [x] (+ x 1))\n(defn mid [x] (inc (deep x)))\n(defn -main [& _] (mid :nan))\n' > "$tr_proj/src/tp/core.clj"
+tr_out="$(JOLT_TRACE=1 JOLT_PWD="$tr_proj" bin/joltc -M:run 2>&1)"
+if printf '%s' "$tr_out" | grep -Eq 'tp\.core/deep \(.*/tp/core\.clj:2\)'; then
+  pass=$((pass + 1))
+else
+  echo "  FAIL: JOLT_TRACE trace should map a frame to ns/name (file:line)"
+  printf '%s\n' "$tr_out" | sed 's/^/    | /'
+  fails=$((fails + 1))
+fi
+rm -rf "$tr_proj"
 
 # --help prints usage, and lists the nREPL server under its real flag name.
 help_out="$(bin/joltc --help 2>/dev/null)"

jolt-core/jolt/backend_scheme.clj

@@ -790,6 +790,21 @@
        (returns-scheme-bool? (:body node) bools'))
      :else false)))
 
+;; In trace mode, a fn def also registers its source so the tail-frame history maps
+;; the recorded frame-name to "ns/name (file:line)" instead of a bare name. Keyed by
+;; the SAME munged name the entry push records (emit-fn's letrec self-binding = the
+;; fn's own name). Returns "" when off / not a positioned fn def, so trace-off output
+;; (seed mint, `jolt build`) is byte-identical. Direct-link builds already register
+;; via emit-def-cached; this covers the open-world eval path.
+(defn- trace-source-reg [node]
+  (let [init (:init node) pos (:pos node)]
+    (if (and @trace-frames? (= :fn (:op init)) (:name init) pos)
+      (str " (jolt-register-source! " (chez-str-lit (munge-name (:name init))) " "
+           (chez-str-lit (:ns node)) " " (chez-str-lit (:name node)) " "
+           (if (:file pos) (chez-str-lit (:file pos)) "jolt-nil") " "
+           (or (:line pos) 0) ")")
+      "")))
+
 (defn emit* [node]
   (case (:op node)
     :const (emit-const (:val node))
@@ -889,7 +904,8 @@
     :fn (emit-fn node)
     ;; (def name) with no init (declare): reserve the cell. A def with non-empty
     ;; reader metadata lowers to def-var-with-meta! (ported in a later increment).
-    :def (cond
+    :def (let [reg (trace-source-reg node)
+               d (cond
                    (:no-init node)
                    (str "(declare-var! " (chez-str-lit (:ns node)) " " (chez-str-lit (:name node)) ")")
                    (jmeta-nonempty? (:meta node))
@@ -897,7 +913,8 @@
                         (emit-with-cells #(emit (:init node))) " " (emit-def-meta node) ")")
                    :else
                    (str "(def-var! " (chez-str-lit (:ns node)) " " (chez-str-lit (:name node)) " "
-                (emit-with-cells #(emit (:init node))) ")"))
+                        (emit-with-cells #(emit (:init node))) ")"))]
+           (if (= reg "") d (str "(begin " d reg ")")))
     (throw (ex-info (str "emit: op not yet ported / unhandled: " (pr-str (:op node))) {}))))
 
 ;; ^:dynamic / ^:redef on a def opts it out of direct-linking: it stays redefinable,