Removed ':namespaced' token type and added a token settings map instead.

Author: Yannick Scherer

project.clj

@@ -5,13 +5,13 @@
             :url "http://www.eclipse.org/legal/epl-v10.html"}
   :repositories  {"sonatype-oss-public" "https://oss.sonatype.org/content/groups/public/"}
   :dependencies [[org.clojure/clojure "1.5.1"]
-                 [org.clojure/tools.reader "0.7.5"]
+                 [org.clojure/tools.reader "0.7.8"]
                  [fast-zip "0.3.0"]
-                 [potemkin "0.3.2"]]
+                 [potemkin "0.3.3"]]
   :profiles {:dev {:dependencies [[midje "1.5.1"]]
-                   :plugins [[lein-midje "3.1.1"]]}
+                   :plugins [[lein-midje "3.1.3-RC1"]]}
              :1.4 {:dependencies [[org.clojure/clojure "1.4.0"]]}
              :1.5 {:dependencies [[org.clojure/clojure "1.5.1"]]}
              :1.6 {:dependencies [[org.clojure/clojure "1.6.0-master-SNAPSHOT"]]}}
-  :aliases {"midje-all" ["with-profile" "dev,1.4:dev,1.5:dev,1.6" "midje"]
+  :aliases {"test-ancient" ["with-profile" "dev,1.4:dev,1.5:dev,1.6" "midje"]
             "deps-all" ["with-profile" "dev,1.4:dev,1.5:dev,1.6" "deps"]})

src/rewrite_clj/parser/core.clj

@@ -140,7 +140,7 @@
   [reader]
   (ignore reader)
   (let [nxt (edn/read reader)]
-    (cond (keyword? nxt) [:namespaced nxt]
+    (cond (keyword? nxt) [:token nxt {:namespaced? true}]
           (symbol? nxt) [:token (keyword nxt)]
           :else (throw-reader "Invalid token(s) following ':' prefix: " nxt))))
 

src/rewrite_clj/printer.clj

@@ -20,8 +20,14 @@
 
 ;; ## Printers
 
+(defmethod print-edn :token 
+  [data] 
+  (let [[_ tk & rst] data]
+    (when (and (keyword? tk) (:namespaced? (first rst)))
+      (print ":"))
+    (pr tk)))
+
 (defmethod print-edn :forms [data] (print-children data))
-(defmethod print-edn :token [data] (pr (second data)))
 (defmethod print-edn :comment [data] (println (second data)))
 (defmethod print-edn :whitespace [data] (print (second data)))
 (defmethod print-edn :newline [data] (print (second data)))
@@ -40,7 +46,6 @@
 (defmethod print-edn :syntax-quote [data] (print-children "`" data))
 (defmethod print-edn :unquote [data] (print-children "~" data))
 (defmethod print-edn :unquote-splicing [data] (print-children "~@" data))
-(defmethod print-edn :namespaced [data] (pr ":") (prn (second data)))
 
 (letfn [(print-line [^String s]
           (let [^String s (pr-str s)]
@@ -96,7 +101,6 @@
 (defmethod estimate-length :syntax-quote [data] (inc (estimate-children-length data)))
 (defmethod estimate-length :unquote [data] (inc (estimate-children-length data)))
 (defmethod estimate-length :unquote-splicing [data] (+ 2 (estimate-children-length data)))
-(defmethod estimate-length :namespaced [data] (inc (count (pr-str (second data)))))
 (defmethod estimate-length :multi-line [data]
   (let [parts (rest data)]
     (+ 2 (count parts) 

test/rewrite_clj/parser_test.clj

@@ -26,7 +26,7 @@
   "\"string\""                 "string")
 
 (fact "about parsing implicitly namespaced keywords"
-    (p/parse-string "::key") => [:namespaced :key])
+    (p/parse-string "::key") => [:token :key {:namespaced? true}])
 
 (tabular
   (fact "about parsing prefixed data"

test/rewrite_clj/printer_test.clj

@@ -0,0 +1,33 @@
+(ns ^{:doc "Tests for EDN printer." 
+      :author "Yannick Scherer"}
+  rewrite-clj.printer-test
+  (:require [midje.sweet :refer :all]
+            [rewrite-clj.parser :refer [parse-string-all]]
+            [rewrite-clj.printer :refer :all]))
+
+(tabular
+  (fact "about correct printing of EDN/Clojure"
+    (let [tree (parse-string-all ?str)]
+      (estimate-length tree) => (count ?str)
+      (->string tree) => ?str))
+  ?str
+  "0"    "0.1"     "1N"
+  ":key" ":ns/key" "::key"
+  "sym"  "sym#"
+  "\"string\""
+
+  "@sym"  "#'sym" "'sym" "~sym"
+  "~@sym" "`sym"  "#=sym"
+
+  "(first form) (second form)"
+  "[:complex (list {:map 0})]"
+  "#=(eval this)" "#date s"
+
+  "#\"regex\"" "#\"regex\\.\"" "#\"[reg|k].x\""
+
+  "^:private s"
+  "^{:private true} s"
+  "#^:private s"
+  "#^{:private true} ^:privates s"
+
+  ";; Hi!\n(def pi 3.14)")