public/browser
1
0
Fork 0
mirror of https://github.com/lightpanda-io/browser.git synced 2025-10-30 15:41:48 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

dom: remove optional node type

Browse Source
This commit is contained in:
Pierre Tachoire
2023-10-27 17:00:17 +02:00
parent 8c1d1e491c
commit 5f05cffff9
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/dom/html_collection.zig
View File

@@ -59,7 +59,7 @@ pub const HTMLCollection = struct {
// TODO: nodes retrieved must be de-referenced. // TODO: nodes retrieved must be de-referenced.
pub fn get_length(self: *HTMLCollection) u32 { pub fn get_length(self: *HTMLCollection) u32 {
var len: u32 = 0; var len: u32 = 0;
var node: ?*parser.Node = self.root; var node: *parser.Node = self.root;
var ntype: parser.NodeType = undefined; var ntype: parser.NodeType = undefined;
// FIXME using a fixed length buffer here avoid the need of an allocator // FIXME using a fixed length buffer here avoid the need of an allocator
@@ -72,15 +72,15 @@ pub const HTMLCollection = struct {
var is_wildcard = std.mem.eql(u8, self.match, "*"); var is_wildcard = std.mem.eql(u8, self.match, "*");
while (node != null) { while (true) {
ntype = parser.nodeType(node.?); ntype = parser.nodeType(node);
if (ntype == .element) { if (ntype == .element) {
if (is_wildcard or std.mem.eql(u8, imatch, parser.nodeName(node.?))) { if (is_wildcard or std.mem.eql(u8, imatch, parser.nodeName(node))) {
len += 1; len += 1;
} }
} }
node = _next(self.root, node.?); node = _next(self.root, node) orelse break;
} }
return len; return len;
@@ -88,7 +88,7 @@ pub const HTMLCollection = struct {
pub fn _item(self: *HTMLCollection, index: u32) ?*parser.Element { pub fn _item(self: *HTMLCollection, index: u32) ?*parser.Element {
var len: u32 = 0; var len: u32 = 0;
var node: ?*parser.Node = self.root; var node: *parser.Node = self.root;
var ntype: parser.NodeType = undefined; var ntype: parser.NodeType = undefined;
var is_wildcard = std.mem.eql(u8, self.match, "*"); var is_wildcard = std.mem.eql(u8, self.match, "*");
@@ -101,10 +101,10 @@ pub const HTMLCollection = struct {
var buffer: [128]u8 = undefined; var buffer: [128]u8 = undefined;
const imatch = std.ascii.upperString(&buffer, self.match); const imatch = std.ascii.upperString(&buffer, self.match);
while (node != null) { while (true) {
ntype = parser.nodeType(node.?); ntype = parser.nodeType(node);
if (ntype == .element) { if (ntype == .element) {
if (is_wildcard or std.mem.eql(u8, imatch, parser.nodeName(node.?))) { if (is_wildcard or std.mem.eql(u8, imatch, parser.nodeName(node))) {
len += 1; len += 1;
// check if we found the searched element. // check if we found the searched element.
@@ -114,7 +114,7 @@ pub const HTMLCollection = struct {
} }
} }
node = _next(self.root, node.?); node = _next(self.root, node) orelse break;
} }
return null; return null;
@@ -125,7 +125,7 @@ pub const HTMLCollection = struct {
return null; return null;
} }
var node: ?*parser.Node = self.root; var node: *parser.Node = self.root;
var ntype: parser.NodeType = undefined; var ntype: parser.NodeType = undefined;
var is_wildcard = std.mem.eql(u8, self.match, "*"); var is_wildcard = std.mem.eql(u8, self.match, "*");
@@ -138,10 +138,10 @@ pub const HTMLCollection = struct {
var buffer: [128]u8 = undefined; var buffer: [128]u8 = undefined;
const imatch = std.ascii.upperString(&buffer, self.match); const imatch = std.ascii.upperString(&buffer, self.match);
while (node != null) { while (true) {
ntype = parser.nodeType(node.?); ntype = parser.nodeType(node);
if (ntype == .element) { if (ntype == .element) {
if (is_wildcard or std.mem.eql(u8, imatch, parser.nodeName(node.?))) { if (is_wildcard or std.mem.eql(u8, imatch, parser.nodeName(node))) {
const elem = @as(*parser.Element, @ptrCast(node)); const elem = @as(*parser.Element, @ptrCast(node));
var attr = parser.elementGetAttribute(elem, "id"); var attr = parser.elementGetAttribute(elem, "id");
@@ -158,7 +158,7 @@ pub const HTMLCollection = struct {
} }
} }
node = _next(self.root, node.?); node = _next(self.root, node) orelse break;
} }
return null; return null;