439068a · elk · git.iko.soy

on master help sign in

Merge pull request #813 from Xashili/arrayAppend

439068aEvan Czaplicki12 years ago

libraries/Native/Array.js+5−3

@@ -390,9 +390,11 @@ Elm.Native.Array.make = function(elm) {

390 return c[0];

391 }

392

393+ if (c[0].height > 0) {

393− var toRemove = calcToRemove(a, b);

394+ var toRemove = calcToRemove(a, b);

394− if (toRemove > E) {

395+ if (toRemove > E) {

395− c = shuffle(c[0], c[1], toRemove);

396+ c = shuffle(c[0], c[1], toRemove);

397+ }

396 }

398 }

397

399

398 return siblise(c[0], c[1]);

400 return siblise(c[0], c[1]);

tests/libraries/Test/Array.elm+2

@@ -37,6 +37,8 @@ tests =

37 , test "append" <| assertEqual [42,42,81,81,81] (Array.toList (Array.append (Array.repeat 2 42) (Array.repeat 3 81)))

38 , test "appendEmpty 1" <| assertEqual [1..33] (Array.toList (Array.append Array.empty (Array.fromList [1..33])))

39 , test "appendEmpty 2" <| assertEqual [1..33] (Array.toList (Array.append (Array.fromList [1..33]) Array.empty))

40+ , test "appendSmall 1" <| assertEqual [1..33] (Array.toList (Array.append (Array.fromList [1..30]) (Array.fromList [31..33])))

41+ , test "appendSmall 2" <| assertEqual [1..33] (Array.toList (Array.append (Array.fromList [1..3]) (Array.fromList [4..33])))

40 , test "appendAndSlice" <| assertEqual [0..100] (Array.toList holeArray)

42 , test "appendAndSlice" <| assertEqual [0..100] (Array.toList holeArray)

41 ]

43 ]

42 getAndSetTests = suite "Get and Set"

44 getAndSetTests = suite "Get and Set"