bfcf2a7 · elk · git.iko.soy

git.iko.soy/elk

Rename String.sub to String.slice and add tests

Name change to get it to match Array library. May be good to bring left, right, dropLeft, and dropRight function to the Array library.

commitbfcf2a70ba5dda9d28589d874a85ee9718d07528 authorEvan Czaplicki <info@elm-lang.org> dateWed 30 Apr 2014, 17:30 (13 years ago) parentc9e46aa

3 files changed+14−10

compare with master

unifiedsplit

libraries/Native/String.js+2−2 libraries/String.elm+8−8 tests/elm/Test/String.elm+4

libraries/Native/String.js+2−2

@@ -73,7 +73,7 @@ Elm.Native.String.make = function(elm) {

7373 return result;

7474 }

7575

76− function sub(start, end, str) {

76+ function slice(start, end, str) {

7777 return str.slice(start,end);

7878 }

7979 function left(n, str) {

@@ -216,7 +216,7 @@ Elm.Native.String.make = function(elm) {

216216 join: F2(join),

217217 repeat: F2(repeat),

218218

219− sub: F3(sub),

219+ slice: F3(slice),

220220 left: F2(left),

221221 right: F2(right),

222222 dropLeft: F2(dropLeft),

libraries/String.elm+8−8

@@ -6,10 +6,10 @@ are enclosed in `"double quotes"`. Strings are *not* lists of characters.

66@docs isEmpty, length, reverse, repeat

88# Building and Splitting

9−@docs cons, uncons, append, concat, split, join, words, lines

9+@docs cons, uncons, append, concat, split, join, words, lines

1010

1111# Get Substrings

12−@docs sub, left, right, dropLeft, dropRight

12+@docs slice, left, right, dropLeft, dropRight

1313

1414# Check for Substrings

1515@docs contains, startsWith, endsWith, indexes, indices

@@ -139,13 +139,13 @@ repeat = Native.String.repeat

139139{-| Take a substring given a start and end index. Negative indexes

140140are taken starting from the *end* of the list.

141141

142− sub 7 9 "snakes on a plane!" == "on"

143− sub 0 6 "snakes on a plane!" == "snakes"

144− sub 0 -7 "snakes on a plane!" == "snakes on a"

145− sub -6 -1 "snakes on a plane!" == "plane"

142+ slice 7 9 "snakes on a plane!" == "on"

143+ slice 0 6 "snakes on a plane!" == "snakes"

144+ slice 0 -7 "snakes on a plane!" == "snakes on a"

145+ slice -6 -1 "snakes on a plane!" == "plane"

146146-}

147−sub : Int -> Int -> String -> String

148−sub = Native.String.sub

147+slice : Int -> Int -> String -> String

148+slice = Native.String.slice

149149

150150{-| Take N characters from the left side of a string. -}

151151left : Int -> String -> String

tests/elm/Test/String.elm+4

@@ -28,6 +28,10 @@ tests =

2828 , test "split slashes"<| assertEqual ["home","steve","Desktop", ""] (split "/" "home/steve/Desktop/")

2929 , test "join spaces" <| assertEqual "cat dog cow" (join " " ["cat","dog","cow"])

3030 , test "join slashes" <| assertEqual "home/steve/Desktop" (join "/" ["home","steve","Desktop"])

31+ , test "slice 1" <| assertEqual "c" (slice 2 3 "abcd")

32+ , test "slice 2" <| assertEqual "abc" (slice 0 3 "abcd")

33+ , test "slice 3" <| assertEqual "abc" (slice 0 -1 "abcd")

34+ , test "slice 4" <| assertEqual "cd" (slice -2 4 "abcd")

3135 ]

3236 in

3337 suite "String" [ simpleTests, combiningTests ]