Skip to content

Commit 2ca4f31

Browse files
authored
Update Lexbor (php#15573)
Updates Lexbor to lexbor/lexbor@31d8644
1 parent 904e8dc commit 2ca4f31

File tree

6 files changed

+18
-24
lines changed

6 files changed

+18
-24
lines changed

ext/dom/lexbor/lexbor/css/selectors/selector.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ typedef uint32_t lxb_css_selector_specificity_t;
110110
((sp) & ~((((uint32_t) 1 << 9) - 1) << (n)))
111111

112112
#define LXB_CSS_SELECTOR_SPECIFICITY_MASK \
113-
((((uint32_t) 1 << 31) - 1) << (9))
113+
((((uint32_t) 1 << (32 - 9)) - 1) << (9))
114114

115115
#define lxb_css_selector_sp_i(sp) ((sp) >> 28)
116116

ext/dom/lexbor/lexbor/dom/interfaces/element.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -651,12 +651,10 @@ lxb_dom_element_qualified_name(lxb_dom_element_t *element, size_t *len)
651651
const lxb_tag_data_t *data;
652652

653653
if (element->qualified_name != 0) {
654-
data = lxb_tag_data_by_id(element->node.owner_document->tags,
655-
element->qualified_name);
654+
data = lxb_tag_data_by_id(element->qualified_name);
656655
}
657656
else {
658-
data = lxb_tag_data_by_id(element->node.owner_document->tags,
659-
element->node.local_name);
657+
data = lxb_tag_data_by_id(element->node.local_name);
660658
}
661659

662660
if (len != NULL) {
@@ -723,8 +721,7 @@ lxb_dom_element_local_name(lxb_dom_element_t *element, size_t *len)
723721
{
724722
const lxb_tag_data_t *data;
725723

726-
data = lxb_tag_data_by_id(element->node.owner_document->tags,
727-
element->node.local_name);
724+
data = lxb_tag_data_by_id(element->node.local_name);
728725
if (data == NULL) {
729726
if (len != NULL) {
730727
*len = 0;

ext/dom/lexbor/lexbor/dom/interfaces/node.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ lxb_dom_node_interface_copy(lxb_dom_node_t *dst,
184184
dst->local_name = src->local_name;
185185
}
186186
else {
187-
tag = lxb_tag_data_by_id(from->tags, src->local_name);
187+
tag = lxb_tag_data_by_id(src->local_name);
188188
if (tag == NULL) {
189189
return LXB_STATUS_ERROR_NOT_EXISTS;
190190
}

ext/dom/lexbor/lexbor/html/parser.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ lxb_html_parse_fragment_chunk_begin(lxb_html_parser_t *parser,
202202
}
203203

204204
lxb_html_tokenizer_set_state_by_tag(parser->tkz, doc->scripting, tag_id, ns);
205-
lxb_html_tokenizer_tmp_tag_id_set(parser->tkz, LXB_TAG__UNDEF);
205+
lxb_html_tokenizer_tmp_tag_id_set(parser->tkz, LXB_TAG__UNDEF);
206206

207207
parser->root = lxb_html_interface_create(new_doc, LXB_TAG_HTML, LXB_NS_HTML);
208208
if (parser->root == NULL) {

ext/dom/lexbor/lexbor/tag/tag.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ lxb_tag_append_lower(lexbor_hash_t *hash, const lxb_char_t *name, size_t length)
6060
}
6161

6262
const lxb_tag_data_t *
63-
lxb_tag_data_by_id(lexbor_hash_t *hash, lxb_tag_id_t tag_id)
63+
lxb_tag_data_by_id(lxb_tag_id_t tag_id)
6464
{
6565
if (tag_id >= LXB_TAG__LAST_ENTRY) {
6666
if (tag_id == LXB_TAG__LAST_ENTRY) {
@@ -121,16 +121,15 @@ lxb_tag_data_by_name_upper(lexbor_hash_t *hash,
121121
* No inline functions for ABI.
122122
*/
123123
const lxb_char_t *
124-
lxb_tag_name_by_id_noi(lexbor_hash_t *hash, lxb_tag_id_t tag_id, size_t *len)
124+
lxb_tag_name_by_id_noi(lxb_tag_id_t tag_id, size_t *len)
125125
{
126-
return lxb_tag_name_by_id(hash, tag_id, len);
126+
return lxb_tag_name_by_id(tag_id, len);
127127
}
128128

129129
const lxb_char_t *
130-
lxb_tag_name_upper_by_id_noi(lexbor_hash_t *hash,
131-
lxb_tag_id_t tag_id, size_t *len)
130+
lxb_tag_name_upper_by_id_noi(lxb_tag_id_t tag_id, size_t *len)
132131
{
133-
return lxb_tag_name_upper_by_id(hash, tag_id, len);
132+
return lxb_tag_name_upper_by_id(tag_id, len);
134133
}
135134

136135
lxb_tag_id_t

ext/dom/lexbor/lexbor/tag/tag.h

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ lxb_tag_data_t;
2929

3030

3131
LXB_API const lxb_tag_data_t *
32-
lxb_tag_data_by_id(lexbor_hash_t *hash, lxb_tag_id_t tag_id);
32+
lxb_tag_data_by_id(lxb_tag_id_t tag_id);
3333

3434
LXB_API const lxb_tag_data_t *
3535
lxb_tag_data_by_name(lexbor_hash_t *hash, const lxb_char_t *name, size_t len);
@@ -42,9 +42,9 @@ lxb_tag_data_by_name_upper(lexbor_hash_t *hash,
4242
* Inline functions
4343
*/
4444
lxb_inline const lxb_char_t *
45-
lxb_tag_name_by_id(lexbor_hash_t *hash, lxb_tag_id_t tag_id, size_t *len)
45+
lxb_tag_name_by_id(lxb_tag_id_t tag_id, size_t *len)
4646
{
47-
const lxb_tag_data_t *data = lxb_tag_data_by_id(hash, tag_id);
47+
const lxb_tag_data_t *data = lxb_tag_data_by_id(tag_id);
4848
if (data == NULL) {
4949
if (len != NULL) {
5050
*len = 0;
@@ -61,9 +61,9 @@ lxb_tag_name_by_id(lexbor_hash_t *hash, lxb_tag_id_t tag_id, size_t *len)
6161
}
6262

6363
lxb_inline const lxb_char_t *
64-
lxb_tag_name_upper_by_id(lexbor_hash_t *hash, lxb_tag_id_t tag_id, size_t *len)
64+
lxb_tag_name_upper_by_id(lxb_tag_id_t tag_id, size_t *len)
6565
{
66-
const lxb_tag_data_t *data = lxb_tag_data_by_id(hash, tag_id);
66+
const lxb_tag_data_t *data = lxb_tag_data_by_id(tag_id);
6767
if (data == NULL) {
6868
if (len != NULL) {
6969
*len = 0;
@@ -101,12 +101,10 @@ lxb_tag_mraw(lexbor_hash_t *hash)
101101
* No inline functions for ABI.
102102
*/
103103
LXB_API const lxb_char_t *
104-
lxb_tag_name_by_id_noi(lexbor_hash_t *hash, lxb_tag_id_t tag_id,
105-
size_t *len);
104+
lxb_tag_name_by_id_noi(lxb_tag_id_t tag_id, size_t *len);
106105

107106
LXB_API const lxb_char_t *
108-
lxb_tag_name_upper_by_id_noi(lexbor_hash_t *hash,
109-
lxb_tag_id_t tag_id, size_t *len);
107+
lxb_tag_name_upper_by_id_noi(lxb_tag_id_t tag_id, size_t *len);
110108

111109
LXB_API lxb_tag_id_t
112110
lxb_tag_id_by_name_noi(lexbor_hash_t *hash,

0 commit comments

Comments
 (0)