diff options
| author | Konrad Hinsen <konrad.hinsen@fastmail.net> | 2010-09-03 21:33:31 +0200 |
|---|---|---|
| committer | Konrad Hinsen <konrad.hinsen@fastmail.net> | 2010-09-03 21:33:31 +0200 |
| commit | bbb200f4053f0f557640825ccf870eb7858f7269 (patch) | |
| tree | 931345016e96923989d823b10071f3922099c149 /modules/json | |
| parent | 67fccc60f2a547f272df858c7367ef805d123ffc (diff) | |
| parent | 1921e118d4a27c75084d0bece364e982ebe189b8 (diff) | |
Merge branch 'master' of git://github.com/clojure/clojure-contrib
Diffstat (limited to 'modules/json')
| -rw-r--r-- | modules/json/pom.xml | 10 | ||||
| -rw-r--r-- | modules/json/src/main/clojure/clojure/contrib/json.clj | 9 |
2 files changed, 7 insertions, 12 deletions
diff --git a/modules/json/pom.xml b/modules/json/pom.xml index 95f611ca..445723e7 100644 --- a/modules/json/pom.xml +++ b/modules/json/pom.xml @@ -12,15 +12,5 @@ </parent> <artifactId>json</artifactId> <dependencies> - <dependency> - <groupId>org.clojure.contrib</groupId> - <artifactId>pprint</artifactId> - <version>1.3.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.clojure.contrib</groupId> - <artifactId>string</artifactId> - <version>1.3.0-SNAPSHOT</version> - </dependency> </dependencies> </project>
\ No newline at end of file diff --git a/modules/json/src/main/clojure/clojure/contrib/json.clj b/modules/json/src/main/clojure/clojure/contrib/json.clj index 69f6cc9d..f8008f7e 100644 --- a/modules/json/src/main/clojure/clojure/contrib/json.clj +++ b/modules/json/src/main/clojure/clojure/contrib/json.clj @@ -17,8 +17,7 @@ To write JSON, use json-str, write-json, or write-json. To read JSON, use read-json."} clojure.contrib.json - (:use [clojure.contrib.pprint :only (write formatter-out)] - [clojure.contrib.string :only (as-str)]) + (:use [clojure.pprint :only (write formatter-out)]) (:import (java.io PrintWriter PushbackReader StringWriter StringReader Reader EOFException))) @@ -228,6 +227,12 @@ (.append sb \") (.print out (str sb)))) +(defn- as-str + [x] + (if (instance? clojure.lang.Named x) + (name x) + (str x))) + (defn- write-json-object [m ^PrintWriter out] (.print out \{) (loop [x m] |