summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorStuart Halloway <stu@thinkrelevance.com>2010-06-02 17:02:38 -0400
committerStuart Halloway <stu@thinkrelevance.com>2010-06-03 21:21:00 -0400
commitfc8af8cb67b2240dd3fd0f391fcd1f718f3d90e3 (patch)
treee2c420e4009c0e789648eb45f2a07139850f8258 /src
parent8c8fc400dac9ecdd01c47a3f462ece1e3822cdd5 (diff)
minor fixes to #359:
- add clojure.string to build, - make replace,replace-first use CharSequence in same way Signed-off-by: Stuart Halloway <stu@thinkrelevance.com>
Diffstat (limited to 'src')
-rw-r--r--src/clj/clojure/string.clj5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/clj/clojure/string.clj b/src/clj/clojure/string.clj
index 76ac2d6d..dc061631 100644
--- a/src/clj/clojure/string.clj
+++ b/src/clj/clojure/string.clj
@@ -64,8 +64,9 @@ clojure.string adheres to the following design principles:
(cond
(instance? Character match) (.replace s ^Character match ^Character replacement)
(instance? CharSequence match) (.replace s ^CharSequence match ^CharSequence replacement)
- (instance? Pattern match) (if (string? replacement)
- (.replaceAll (re-matcher ^Pattern match s) ^CharSequence replacement)
+ (instance? Pattern match) (if (instance? CharSequence replacement)
+ (.replaceAll (re-matcher ^Pattern match s)
+ (.toString replacement))
(replace-by s match replacement))
:else (throw (IllegalArgumentException. (str "Invalid match arg: " match))))))