From 3ea95982d657aeeddb7598af9183310831dbe1ef Mon Sep 17 00:00:00 2001 From: Pierre Tachoire Date: Fri, 15 Dec 2023 13:51:55 +0100 Subject: [PATCH] dom: nodelist: use unmanaged arraylist --- src/dom/document.zig | 4 ++-- src/dom/element.zig | 4 ++-- src/dom/node.zig | 2 +- src/dom/nodelist.zig | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/dom/document.zig b/src/dom/document.zig index 9ab1b852..16350634 100644 --- a/src/dom/document.zig +++ b/src/dom/document.zig @@ -228,7 +228,7 @@ pub const Document = struct { if (try parser.nodeType(next.?) != .element) { continue; } - try list.append(next.?); + try list.append(alloc, next.?); } } @@ -237,7 +237,7 @@ pub const Document = struct { // walk over the node tree fo find the node by id. const e = try parser.documentGetElementById(self, selectors[1..]) orelse return list; - try list.append(parser.elementToNode(e)); + try list.append(alloc, parser.elementToNode(e)); return list; } diff --git a/src/dom/element.zig b/src/dom/element.zig index 50999314..ef483e27 100644 --- a/src/dom/element.zig +++ b/src/dom/element.zig @@ -247,7 +247,7 @@ pub const Element = struct { if (try parser.nodeType(next.?) != .element) { continue; } - try list.append(next.?); + try list.append(alloc, next.?); } } @@ -256,7 +256,7 @@ pub const Element = struct { // walk over the node tree fo find the node by id. const n = try getElementById(self, selectors[1..]) orelse return list; - try list.append(n); + try list.append(alloc, n); return list; } diff --git a/src/dom/node.zig b/src/dom/node.zig index 3144ea4e..540c6b26 100644 --- a/src/dom/node.zig +++ b/src/dom/node.zig @@ -200,7 +200,7 @@ pub const Node = struct { var n = try parser.nodeFirstChild(self) orelse return list; while (true) { - try list.append(n); + try list.append(alloc, n); n = try parser.nodeNextSibling(n) orelse return list; } } diff --git a/src/dom/nodelist.zig b/src/dom/nodelist.zig index b663ec4b..269f2e4a 100644 --- a/src/dom/nodelist.zig +++ b/src/dom/nodelist.zig @@ -18,14 +18,14 @@ pub const NodeList = struct { pub const mem_guarantied = true; pub const Exception = DOMException; - const NodesArrayList = std.ArrayList(*parser.Node); + const NodesArrayList = std.ArrayListUnmanaged(*parser.Node); nodes: NodesArrayList, pub fn init(alloc: std.mem.Allocator) !*NodeList { const list = try alloc.create(NodeList); list.* = NodeList{ - .nodes = NodesArrayList.init(alloc), + .nodes = NodesArrayList{}, }; return list; @@ -33,12 +33,12 @@ pub const NodeList = struct { pub fn deinit(self: *NodeList, alloc: std.mem.Allocator) void { // TODO unref all nodes - self.nodes.deinit(); + self.nodes.deinit(alloc); alloc.destroy(self); } - pub fn append(self: *NodeList, node: *parser.Node) !void { - try self.nodes.append(node); + pub fn append(self: *NodeList, alloc: std.mem.Allocator, node: *parser.Node) !void { + try self.nodes.append(alloc, node); } pub fn get_length(self: *NodeList) u32 {