From c0ff51db2c38c0fb1ab8d6da54781337a6d6a0fe Mon Sep 17 00:00:00 2001 From: fogus Date: Fri, 14 Jan 2011 23:01:51 -0500 Subject: [PATCH] repushed v4.0.0 pom for markdownj --- project.clj | 6 +++--- src/marginalia/parser.clj | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/project.clj b/project.clj index 4edd7a3..e597433 100644 --- a/project.clj +++ b/project.clj @@ -4,15 +4,15 @@ :eval-in-leiningen true :dependencies [[org.clojure/clojure "1.2.0"] - [org.clojars.nakkaya/markdownj "1.0.2b4"] - [hiccup "0.3.0"]] + [hiccup "0.3.0"] + [org.markdownj/markdownj "0.3.0-1.0.2b4"]] :dev-dependencies [[lein-clojars "0.5.0-SNAPSHOT"] [jline "0.9.94"] [swank-clojure "1.2.1"] ;;Needed for testing lein plugin [hiccup "0.3.0"] - [org.clojars.nakkaya/markdownj "1.0.2b4"] + [org.markdownj/markdownj "0.3.0-1.0.2b4"] [marginalia "0.3.2"]] ;;Needed for testing cake plugin :tasks [marginalia.tasks] diff --git a/src/marginalia/parser.clj b/src/marginalia/parser.clj index be435fd..473d9e6 100644 --- a/src/marginalia/parser.clj +++ b/src/marginalia/parser.clj @@ -34,12 +34,22 @@ (defn parse-file [filepath] - (let [parser (make-parse-fn (slurp filepath))] + (let [parser! (make-parse-fn (slurp filepath))] (loop [lines []] - (if-let [result (try (parser) (catch Exception _ nil))] + (if-let [result (try (parser!) (catch Exception _ nil))] (recur (conj lines result)) lines)))) (comment (parse-file "../marginalia/src/marginalia/parser.clj") + + (aget (get-field clojure.lang.LispReader :macros nil) (int (first "^"))) + + (def R (make-parse-fn "(def ^{:doc \"this is doc\" :author \"fogus\"} + foo + ^{:gah :goo} + [1 2 3])")) + + (def e (R)) + (map meta e) )