diff options
| -rw-r--r-- | src/main/clojure/clojure/contrib/json/read.clj | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/main/clojure/clojure/contrib/json/read.clj b/src/main/clojure/clojure/contrib/json/read.clj index e9c7a3f2..496a8c54 100644 --- a/src/main/clojure/clojure/contrib/json/read.clj +++ b/src/main/clojure/clojure/contrib/json/read.clj @@ -47,7 +47,7 @@ ", :see-also [["http://www.json.org", "JSON Home Page"]]} clojure.contrib.json.read - (:import (java.io PushbackReader StringReader EOFException)) + (:import (java.io PushbackReader StringReader Reader EOFException)) (:use [clojure.test :only (deftest- is)])) (declare read-json) @@ -144,9 +144,14 @@ "Read one JSON record from s, which may be a String or a java.io.PushbackReader." ([] (read-json *in* true nil)) - ([s] (if (string? s) - (read-json (PushbackReader. (StringReader. s)) true nil) - (read-json s true nil))) + ([s] (cond (string? s) + (read-json (PushbackReader. (StringReader. s)) true nil) + + (instance? PushbackReader s) + (read-json s true nil) + + (instance? Reader s) + (read-json (PushbackReader. s) true nil))) ([#^PushbackReader stream eof-error? eof-value] (loop [i (.read stream)] (let [c (char i)] |