From 70e584991a3f9f4db1887ae9e7a280ad473bd3f9 Mon Sep 17 00:00:00 2001 From: oakes Date: Mon, 31 Mar 2014 11:54:00 -0400 Subject: [PATCH] Rename file and clean up code --- doclet/resources/{targets.edn => classes.edn} | 0 doclet/src/clojure/play_clj_doclet/core.clj | 8 +++----- 2 files changed, 3 insertions(+), 5 deletions(-) rename doclet/resources/{targets.edn => classes.edn} (100%) diff --git a/doclet/resources/targets.edn b/doclet/resources/classes.edn similarity index 100% rename from doclet/resources/targets.edn rename to doclet/resources/classes.edn diff --git a/doclet/src/clojure/play_clj_doclet/core.clj b/doclet/src/clojure/play_clj_doclet/core.clj index f695124..037dc6d 100644 --- a/doclet/src/clojure/play_clj_doclet/core.clj +++ b/doclet/src/clojure/play_clj_doclet/core.clj @@ -7,7 +7,7 @@ (:import [com.sun.javadoc ClassDoc ConstructorDoc Doc ExecutableMemberDoc FieldDoc MethodDoc Parameter RootDoc])) -(def targets (-> "targets.edn" io/resource slurp edn/read-string)) +(def classes (-> "classes.edn" io/resource slurp edn/read-string)) (defn camel->keyword [s] @@ -66,12 +66,10 @@ (defn parse-class [^ClassDoc c] - (some->> (get targets (.typeName c)) + (some->> (get classes (.typeName c)) (map #(vector (first %) (parse-class-entry c (second %)))) (into {}))) -(def ^:const valid-syms #{'defn 'defmacro}) - (defn match? [doc-name sym-name] (or (= doc-name sym-name) @@ -81,7 +79,7 @@ [{:keys [type raw] :as group} doc-map] (let [form (read-string raw) n (second form)] - (when (and (contains? valid-syms (first form)) + (when (and (contains? #{'defn 'defmacro} (first form)) (-> n meta :private not)) (assoc group :name (str n)