authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-07-14 10:01:45-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-07-14 10:01:45-04:00
logb44332f5a663c8e96e546d6a2b6071bf96ce9bcb
tree256601da94f9a2fd05b793d78377999b6a8fa1f4
parenta0c1498e65d34e4f7d003ef1a804a87fa6c83ed3

std.ArrayList - rename remove to swapRemove

1 files changed, 22 insertions(+), 21 deletions(-)

std/array_list.zig+22-21
......@@ -41,8 +41,8 @@ pub fn AlignedArrayList(comptime T: type, comptime A: u29) type {
4141 return self.items[0..self.len];
4242 }
4343
44 pub fn at(self: Self, n: usize) T {
45 return self.toSliceConst()[n];
44 pub fn at(self: Self, i: usize) T {
45 return self.toSliceConst()[i];
4646 }
4747
4848 /// Sets the value at index `i`, or returns `error.OutOfBounds` if
......@@ -101,21 +101,22 @@ pub fn AlignedArrayList(comptime T: type, comptime A: u29) type {
101101 const new_item_ptr = try self.addOne();
102102 new_item_ptr.* = item;
103103 }
104
104
105105 /// Removes the element at the specified index and returns it.
106 // The empty slot is filled from the end of the list.
107 pub fn remove(self: *Self, n: usize) T {
108 if(self.len - 1 == n) return self.pop();
109
110 var old_item = self.at(n);
111 self.set(n, self.pop());
106 /// The empty slot is filled from the end of the list.
107 pub fn swapRemove(self: *Self, i: usize) T {
108 if (self.len - 1 == i) return self.pop();
109
110 const slice = self.toSlice();
111 const old_item = slice[i];
112 slice[i] = self.pop();
112113 return old_item;
113114 }
114
115
115116 pub fn removeOrError(self: *Self, n: usize) !T {
116 if(n >= self.len) return error.OutOfBounds;
117 if(self.len - 1 == n) return self.pop();
118
117 if (n >= self.len) return error.OutOfBounds;
118 if (self.len - 1 == n) return self.pop();
119
119120 var old_item = self.at(n);
120121 try self.setOrError(n, self.pop());
121122 return old_item;
......@@ -176,7 +177,7 @@ pub fn AlignedArrayList(comptime T: type, comptime A: u29) type {
176177 it.count += 1;
177178 return val;
178179 }
179
180
180181 pub fn reset(it: *Iterator) void {
181182 it.count = 0;
182183 }
......@@ -251,7 +252,7 @@ test "basic ArrayList test" {
251252 assert(list.pop() == 33);
252253}
253254
254test "remove ArrayList test" {
255test "std.ArrayList.swapRemove" {
255256 var list = ArrayList(i32).init(debug.global_allocator);
256257 defer list.deinit();
257258
......@@ -262,18 +263,18 @@ test "remove ArrayList test" {
262263 try list.append(5);
263264 try list.append(6);
264265 try list.append(7);
265
266
266267 //remove from middle
267 assert(list.remove(3) == 4);
268 assert(list.swapRemove(3) == 4);
268269 assert(list.at(3) == 7);
269270 assert(list.len == 6);
270
271
271272 //remove from end
272 assert(list.remove(5) == 6);
273 assert(list.swapRemove(5) == 6);
273274 assert(list.len == 5);
274
275
275276 //remove from front
276 assert(list.remove(0) == 1);
277 assert(list.swapRemove(0) == 1);
277278 assert(list.at(0) == 5);
278279 assert(list.len == 4);
279280}