arg order fix, rename chomp-> trim-nl, drop chop, perf

Signed-off-by: Stuart Halloway <stu@thinkrelevance.com>

src/clj/clojure/string.clj

@@ -118,26 +118,23 @@
 (defn ^String triml
   "Removes whitespace from the left side of string."
   [^String s]
-  (replace-re #"^\s+" "" s))
+  (replace s #"^\s+" ""))
 
 (defn ^String trimr
   "Removes whitespace from the right side of string."
   [^String s]
-  (replace-re #"\s+$" "" s))
+  (replace s #"\s+$" ""))
 
-(defn ^String chop
-  "Removes the last character of string, does nothing on a zero-length
-  string."
-  [^String s]
-  (let [size (count s)]
-    (if (zero? size)
-      s
-      (subs s 0 (dec (count s))))))
-
-(defn ^String chomp
+(defn ^String trim-nl
   "Removes all trailing newline \\n or return \\r characters from
   string.  Note: String.trim() is similar and faster."
   [^String s]
-  (replace-re #"[\r\n]+$" "" s))
+  (loop [offset (.length s)]
+    (if (zero? offset)
+      ""
+      (let [ch (.charAt s (dec offset))]
+        (if (or (= ch \newline) (= ch \return))
+          (recur (dec offset))
+          (.substring s 0 offset))))))
 
 

test/clojure/test_clojure/string.clj

@@ -27,16 +27,11 @@
        "1" \, [1]
        "1 and-a 2 and-a 3" " and-a " [1 2 3]))
 
-(deftest t-chop
-  (is (= "fo" (s/chop "foo")))
-  (is (= "") (s/chop "f"))
-  (is (= "") (s/chop "")))
-
-(deftest t-chomp
-  (is (= "foo" (s/chomp "foo\n")))
-  (is (= "foo" (s/chomp "foo\r\n")))
-  (is (= "foo" (s/chomp "foo")))
-  (is (= "" (s/chomp ""))))
+(deftest t-trim-nl
+  (is (= "foo" (s/trim-nl "foo\n")))
+  (is (= "foo" (s/trim-nl "foo\r\n")))
+  (is (= "foo" (s/trim-nl "foo")))
+  (is (= "" (s/trim-nl ""))))
 
 (deftest t-capitalize
   (is (= "Foobar" (s/capitalize "foobar")))