b80c904 · elk · git.iko.soy

on master help sign in

Merge branch 'pr/622'

b80c904Evan Czaplicki12 years ago

libraries/Native/Array.js+7−1

@@ -240,10 +240,16 @@ Elm.Native.Array.make = function(elm) {

240

241 // Maps a function over the elements with their index as first argument.

242 function indexedMap(f, a) {

243+ return indexedMap_(f, a, 0);

244+ }

245+

246+ function indexedMap_(f, a, from) {

243 var newA = { ctor:"_Array", height:a.height, table:new Array(a.table) };

247 var newA = { ctor:"_Array", height:a.height, table:new Array(a.table) };

244 if (a.height > 0) { newA.lengths = a.lengths; }

248 if (a.height > 0) { newA.lengths = a.lengths; }

245 for (var i = 0; i < a.table.length; i++) {

249 for (var i = 0; i < a.table.length; i++) {

246− newA.table[i] = a.height == 0 ? A2(f, i, a.table[i]) : indexedMap(f, a.table[i]);

250+ newA.table[i] = a.height == 0 ? A2(f, from + i, a.table[i])

251+ : indexedMap_( f, a.table[i]

252+ , i == 0 ? 0 : a.lengths[i - 1]);

247 }

253 }

248 return newA;

254 return newA;

249 }

255 }

tests/elm/Test/Array.elm+2−1

@@ -46,7 +46,8 @@ tests =

46 ]

47 mappingAndFoldingTests = suite "Mapping and Folding"

48 [ test "map" <| assertEqual (Array.fromList [1,2,3]) (Array.map sqrt (Array.fromList [1,4,9]))

49− , test "indexedMap" <| assertEqual (Array.fromList [0,5,10]) (Array.indexedMap (*) (Array.fromList [5,5,5]))

49+ , test "indexedMap 1" <| assertEqual (Array.fromList [0,5,10]) (Array.indexedMap (*) (Array.fromList [5,5,5]))

50+ , test "indexedMap 2" <| assertEqual [0..99] (Array.toList (Array.indexedMap always (Array.repeat 100 0)))

50 , test "foldl" <| assertEqual [3,2,1] (Array.foldl (::) [] (Array.fromList [1,2,3]))

51 , test "foldl" <| assertEqual [3,2,1] (Array.foldl (::) [] (Array.fromList [1,2,3]))

51 , test "foldr 1" <| assertEqual 15 (Array.foldr (+) 0 (Array.repeat 3 5))

52 , test "foldr 1" <| assertEqual 15 (Array.foldr (+) 0 (Array.repeat 3 5))

52 , test "foldr 2" <| assertEqual [1,2,3] (Array.foldr (::) [] (Array.fromList [1,2,3]))

53 , test "foldr 2" <| assertEqual [1,2,3] (Array.foldr (::) [] (Array.fromList [1,2,3]))