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>

build.xml

@@ -111,6 +111,7 @@
       <arg value="clojure.java.javadoc"/>
       <arg value="clojure.java.shell"/>
       <arg value="clojure.java.browse-ui"/>
+      <arg value="clojure.string"/>
     </java>
   </target>
 

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))))))
 

test/clojure/test_clojure/string.clj

@@ -81,6 +81,7 @@
        "paz" s/reverse ["zap"]
        "foo:bar" s/replace ["foo-bar" \- \:]
        "ABC" s/replace ["abc" #"\w" s/upper-case]
+       "faa" s/replace ["foo" #"o" (StringBuffer. "a")]
        "baz::quux" s/replace-first ["baz--quux" #"--" "::"]
        "baz::quux" s/replace-first ["baz--quux" (StringBuffer. "--") (StringBuffer. "::")]
        "zim-zam" s/replace-first ["zim zam" #" " (StringBuffer. "-")]