From 7beca7e0f6e96119f3f33f606423d3af46ccd36d Mon Sep 17 00:00:00 2001 From: Scott Richmond Date: Thu, 26 May 2022 18:12:23 -0400 Subject: [PATCH] Fix line number reporting --- src/ludus/interpreter.clj | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/ludus/interpreter.clj b/src/ludus/interpreter.clj index 3e750a7..1c9be13 100644 --- a/src/ludus/interpreter.clj +++ b/src/ludus/interpreter.clj @@ -7,6 +7,7 @@ [ludus.data :as data] [ludus.show :as show] [ludus.loader :as loader] + [ludus.token :as token] [clojure.pprint :as pp] [clojure.set])) @@ -517,7 +518,7 @@ (interpret-ast (::parser/ast parsed) {::file file}) (catch clojure.lang.ExceptionInfo e (println "Ludus panicked in" file) - (println "On line" (get-in e [:ast :token :line])) + (println "On line" (get-in e [:ast :token ::token/line])) (println (ex-message e)) (pp/pprint (ex-data e)) (System/exit 67)))) @@ -527,15 +528,13 @@ (interpret-ast (::parser/ast parsed) {}) (catch clojure.lang.ExceptionInfo e (println "Ludus panicked!") + (println "On line" (get-in (ex-data e) [:ast :token ::token/line])) (println (ex-message e)) (pp/pprint (ex-data e))))) -(comment +(do - (def source " - - fn foo () -> ${1, 2, 3} - let bar = ${1, ...foo (), 3} + (def source "panic! :oops ")