authorgravatar for andrea@orru.ioAndrea Orru <andrea@orru.io> 2017-09-21 16:28:44+02:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-09-21 10:28:44-04:00
loge7a01c24a32affb31cff8506e611401fc28261d5
tree146ec1cb44676682da94adf633912ae38d01130f
parentc2f3dc94eba85a32f3b7ab5857b33636a0a2e4df

LinkedList helper functions (#493)

* Restore LinkedList helper functions * mem.Allocator

1 files changed, 46 insertions(+), 26 deletions(-)

std/linked_list.zig+46-26
......@@ -1,6 +1,7 @@
11const debug = @import("debug.zig");
22const assert = debug.assert;
33const mem = @import("mem.zig");
4const Allocator = mem.Allocator;
45
56/// Generic doubly linked list.
67pub fn LinkedList(comptime T: type) -> type {
......@@ -15,9 +16,9 @@ pub fn LinkedList(comptime T: type) -> type {
1516
1617 pub fn init(data: &const T) -> Node {
1718 Node {
18 .data = *data,
1919 .prev = null,
2020 .next = null,
21 .data = *data,
2122 }
2223 }
2324 };
......@@ -157,38 +158,57 @@ pub fn LinkedList(comptime T: type) -> type {
157158 return first;
158159 }
159160
160 }
161}
162
163pub fn testAllocateNode(comptime T: type, list: &LinkedList(T), allocator: &mem.Allocator) -> %&LinkedList(T).Node {
164 allocator.create(LinkedList(T).Node)
165}
161 /// Allocate a new node.
162 ///
163 /// Arguments:
164 /// allocator: Dynamic memory allocator.
165 ///
166 /// Returns:
167 /// A pointer to the new node.
168 pub fn allocateNode(list: &Self, allocator: &Allocator) -> %&Node {
169 allocator.create(Node)
170 }
166171
167pub fn testDestroyNode(comptime T: type, list: &LinkedList(T), node: &LinkedList(T).Node, allocator: &mem.Allocator) {
168 allocator.destroy(node);
169}
172 /// Deallocate a node.
173 ///
174 /// Arguments:
175 /// node: Pointer to the node to deallocate.
176 /// allocator: Dynamic memory allocator.
177 pub fn destroyNode(list: &Self, node: &Node, allocator: &Allocator) {
178 allocator.destroy(node);
179 }
170180
171pub fn testCreateNode(comptime T: type, list: &LinkedList(T), data: &const T, allocator: &mem.Allocator) -> %&LinkedList(T).Node {
172 var node = %return testAllocateNode(T, list, allocator);
173 *node = LinkedList(T).Node.init(data);
174 return node;
181 /// Allocate and initialize a node and its data.
182 ///
183 /// Arguments:
184 /// data: The data to put inside the node.
185 /// allocator: Dynamic memory allocator.
186 ///
187 /// Returns:
188 /// A pointer to the new node.
189 pub fn createNode(list: &Self, data: &const T, allocator: &Allocator) -> %&Node {
190 var node = %return list.allocateNode(allocator);
191 *node = Node.init(data);
192 return node;
193 }
194 }
175195}
176196
177197test "basic linked list test" {
178198 const allocator = &debug.global_allocator;
179199 var list = LinkedList(u32).init();
180200
181 var one = %%testCreateNode(u32, &list, 1, allocator);
182 var two = %%testCreateNode(u32, &list, 2, allocator);
183 var three = %%testCreateNode(u32, &list, 3, allocator);
184 var four = %%testCreateNode(u32, &list, 4, allocator);
185 var five = %%testCreateNode(u32, &list, 5, allocator);
201 var one = %%list.createNode(1, allocator);
202 var two = %%list.createNode(2, allocator);
203 var three = %%list.createNode(3, allocator);
204 var four = %%list.createNode(4, allocator);
205 var five = %%list.createNode(5, allocator);
186206 defer {
187 testDestroyNode(u32, &list, one, allocator);
188 testDestroyNode(u32, &list, two, allocator);
189 testDestroyNode(u32, &list, three, allocator);
190 testDestroyNode(u32, &list, four, allocator);
191 testDestroyNode(u32, &list, five, allocator);
207 list.destroyNode(one, allocator);
208 list.destroyNode(two, allocator);
209 list.destroyNode(three, allocator);
210 list.destroyNode(four, allocator);
211 list.destroyNode(five, allocator);
192212 }
193213
194214 list.append(two); // {2}
......@@ -197,7 +217,7 @@ test "basic linked list test" {
197217 list.insertBefore(five, four); // {1, 2, 4, 5}
198218 list.insertAfter(two, three); // {1, 2, 3, 4, 5}
199219
200 // traverse forwards
220 // Traverse forwards.
201221 {
202222 var it = list.first;
203223 var index: u32 = 1;
......@@ -207,7 +227,7 @@ test "basic linked list test" {
207227 }
208228 }
209229
210 // traverse backwards
230 // Traverse backwards.
211231 {
212232 var it = list.last;
213233 var index: u32 = 1;