diff --git a/project.clj b/project.clj index a019732..8a1f75f 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject org.rksm/cloxp-source-reader "0.1.5" +(defproject org.rksm/cloxp-source-reader "0.1.6" :description "Source reading, parsing, and querying for cloxp." :license {:name "MIT License" :url "http://opensource.org/licenses/MIT"} diff --git a/src/rksm/cloxp_source_reader/core.clj b/src/rksm/cloxp_source_reader/core.clj index 39cc650..ac535ab 100644 --- a/src/rksm/cloxp_source_reader/core.clj +++ b/src/rksm/cloxp_source_reader/core.clj @@ -87,7 +87,7 @@ => '(String [:user/foo \"Bar\"])" [form] - (if (seq? form) + (if (defmethod? form) (let [ex-form (macroexpand form) [_ _ _ match-1 fn-def] ex-form rest-matches (if (= (->> fn-def last (map type)) @@ -143,9 +143,9 @@ column (+ (if (> (count ws-lines) 0) 1 start-column) (count leading-ws)) meta (meta o) def? (def? o) - defmethod? (defmethod? o) + defmethod? (if def? (defmethod? o)) name (if def? (name-of-def o)) - defmethod-name (defmethod-qualifier-string o)] + defmethod-name (if defmethod? (defmethod-qualifier-string o))] (when (= \newline (trt/peek-char rdr)) (trt/read-char rdr) (purge-string! rdr))