Skip to content

Commit b35796a

Browse files
nielsdosnielsdos
committed
Code style linebreaks
1 parent f806ca4 commit b35796a

File tree

5 files changed

+433
-69
lines changed

5 files changed

+433
-69
lines changed

‎ext/dom/html5_parser.c

Lines changed: 72 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,13 @@ typedef struct {
4040
xmlNsPtr lxml_ns;
4141
} work_list_item;
4242

43-
static void lexbor_libxml2_bridge_work_list_item_push(lexbor_array_obj_t *array, lxb_dom_node_t *node, uintptr_t current_active_namespace, xmlNodePtr lxml_parent, xmlNsPtr lxml_ns)
43+
static void lexbor_libxml2_bridge_work_list_item_push(
44+
lexbor_array_obj_t *array,
45+
lxb_dom_node_t *node,
46+
uintptr_t current_active_namespace,
47+
xmlNodePtr lxml_parent,
48+
xmlNsPtr lxml_ns
49+
)
4450
{
4551
work_list_item *item = (work_list_item *) lexbor_array_obj_push_wo_cls(array);
4652
item->node = node;
@@ -68,7 +74,12 @@ static const xmlChar *get_libxml_namespace_href(uintptr_t lexbor_namespace)
6874
}
6975
}
7076

71-
static lexbor_libxml2_bridge_status lexbor_libxml2_bridge_convert(lxb_dom_node_t *start_node, xmlDocPtr lxml_doc, bool compact_text_nodes, bool create_default_ns)
77+
static lexbor_libxml2_bridge_status lexbor_libxml2_bridge_convert(
78+
lxb_dom_node_t *start_node,
79+
xmlDocPtr lxml_doc,
80+
bool compact_text_nodes,
81+
bool create_default_ns
82+
)
7283
{
7384
lexbor_libxml2_bridge_status retval = LEXBOR_LIBXML2_BRIDGE_STATUS_OK;
7485

@@ -106,14 +117,27 @@ static lexbor_libxml2_bridge_status lexbor_libxml2_bridge_convert(lxb_dom_node_t
106117
if (create_default_ns && UNEXPECTED(entering_namespace != current_stack_item->current_active_namespace)) {
107118
current_lxml_ns = xmlNewNs(lxml_element, get_libxml_namespace_href(entering_namespace), NULL);
108119
}
109-
lxml_element->ns = current_lxml_ns; /* Instead of xmlSetNs() because we know the arguments are valid. Prevents overhead. */
120+
/* Instead of xmlSetNs() because we know the arguments are valid. Prevents overhead. */
121+
lxml_element->ns = current_lxml_ns;
110122

111123
for (lxb_dom_node_t *child_node = element->node.last_child; child_node != NULL; child_node = child_node->prev) {
112-
lexbor_libxml2_bridge_work_list_item_push(&work_list, child_node, entering_namespace, lxml_element, current_lxml_ns);
124+
lexbor_libxml2_bridge_work_list_item_push(
125+
&work_list,
126+
child_node,
127+
entering_namespace,
128+
lxml_element,
129+
current_lxml_ns
130+
);
113131
}
114132

115133
for (lxb_dom_attr_t *attr = element->last_attr; attr != NULL; attr = attr->prev) {
116-
lexbor_libxml2_bridge_work_list_item_push(&work_list, (lxb_dom_node_t *) attr, entering_namespace, lxml_element, current_lxml_ns);
134+
lexbor_libxml2_bridge_work_list_item_push(
135+
&work_list,
136+
(lxb_dom_node_t *) attr,
137+
entering_namespace,
138+
lxml_element,
139+
current_lxml_ns
140+
);
117141
}
118142
} else if (node->type == LXB_DOM_NODE_TYPE_TEXT) {
119143
lxb_dom_text_t *text = lxb_dom_interface_text(node);
@@ -157,7 +181,12 @@ static lexbor_libxml2_bridge_status lexbor_libxml2_bridge_convert(lxb_dom_node_t
157181
size_t public_id_len, system_id_len;
158182
const lxb_char_t *public_id = lxb_dom_document_type_public_id(doctype, &public_id_len);
159183
const lxb_char_t *system_id = lxb_dom_document_type_system_id(doctype, &system_id_len);
160-
xmlDtdPtr lxml_dtd = xmlCreateIntSubset(lxml_doc, name, public_id_len ? public_id : NULL, system_id_len ? system_id : NULL);
184+
xmlDtdPtr lxml_dtd = xmlCreateIntSubset(
185+
lxml_doc,
186+
name,
187+
public_id_len ? public_id : NULL,
188+
system_id_len ? system_id : NULL
189+
);
161190
if (UNEXPECTED(lxml_dtd == NULL)) {
162191
retval = LEXBOR_LIBXML2_BRIDGE_STATUS_OOM;
163192
goto out;
@@ -199,13 +228,22 @@ void lexbor_libxml2_bridge_parse_context_init(lexbor_libxml2_bridge_parse_contex
199228
memset(ctx, 0, sizeof(*ctx));
200229
}
201230

202-
void lexbor_libxml2_bridge_parse_set_error_callbacks(lexbor_libxml2_bridge_parse_context *ctx, lexbor_libxml2_bridge_tokenizer_error_reporter tokenizer_error_reporter, lexbor_libxml2_bridge_tree_error_reporter tree_error_reporter)
231+
void lexbor_libxml2_bridge_parse_set_error_callbacks(
232+
lexbor_libxml2_bridge_parse_context *ctx,
233+
lexbor_libxml2_bridge_tokenizer_error_reporter tokenizer_error_reporter,
234+
lexbor_libxml2_bridge_tree_error_reporter tree_error_reporter
235+
)
203236
{
204237
ctx->tokenizer_error_reporter = tokenizer_error_reporter;
205238
ctx->tree_error_reporter = tree_error_reporter;
206239
}
207240

208-
lexbor_libxml2_bridge_status lexbor_libxml2_bridge_convert_document(lxb_html_document_t *document, xmlDocPtr *doc_out, bool compact_text_nodes, bool create_default_ns)
241+
lexbor_libxml2_bridge_status lexbor_libxml2_bridge_convert_document(
242+
lxb_html_document_t *document,
243+
xmlDocPtr *doc_out,
244+
bool compact_text_nodes,
245+
bool create_default_ns
246+
)
209247
{
210248
#ifdef LIBXML_HTML_ENABLED
211249
xmlDocPtr lxml_doc = htmlNewDocNoDtD(NULL, NULL);
@@ -218,7 +256,12 @@ lexbor_libxml2_bridge_status lexbor_libxml2_bridge_convert_document(lxb_html_doc
218256
if (!lxml_doc) {
219257
return LEXBOR_LIBXML2_BRIDGE_STATUS_OOM;
220258
}
221-
lexbor_libxml2_bridge_status status = lexbor_libxml2_bridge_convert(lxb_dom_interface_node(document)->last_child, lxml_doc, compact_text_nodes, create_default_ns);
259+
lexbor_libxml2_bridge_status status = lexbor_libxml2_bridge_convert(
260+
lxb_dom_interface_node(document)->last_child,
261+
lxml_doc,
262+
compact_text_nodes,
263+
create_default_ns
264+
);
222265
if (status != LEXBOR_LIBXML2_BRIDGE_STATUS_OK) {
223266
xmlFreeDoc(lxml_doc);
224267
return status;
@@ -227,7 +270,14 @@ lexbor_libxml2_bridge_status lexbor_libxml2_bridge_convert_document(lxb_html_doc
227270
return LEXBOR_LIBXML2_BRIDGE_STATUS_OK;
228271
}
229272

230-
void lexbor_libxml2_bridge_report_errors(const lexbor_libxml2_bridge_parse_context *ctx, lxb_html_parser_t *parser, const lxb_char_t *input_html, size_t chunk_offset, size_t *error_index_offset_tokenizer, size_t *error_index_offset_tree)
273+
void lexbor_libxml2_bridge_report_errors(
274+
const lexbor_libxml2_bridge_parse_context *ctx,
275+
lxb_html_parser_t *parser,
276+
const lxb_char_t *input_html,
277+
size_t chunk_offset,
278+
size_t *error_index_offset_tokenizer,
279+
size_t *error_index_offset_tree
280+
)
231281
{
232282
void *error;
233283

@@ -238,7 +288,11 @@ void lexbor_libxml2_bridge_report_errors(const lexbor_libxml2_bridge_parse_conte
238288
/* See https://github.com/lexbor/lexbor/blob/master/source/lexbor/html/tokenizer/error.h */
239289
lxb_html_tokenizer_error_t *token_error = error;
240290
if (ctx->tokenizer_error_reporter) {
241-
ctx->tokenizer_error_reporter(ctx->application_data, token_error, token_error->pos - input_html + chunk_offset);
291+
ctx->tokenizer_error_reporter(
292+
ctx->application_data,
293+
token_error,
294+
token_error->pos - input_html + chunk_offset
295+
);
242296
}
243297
index++;
244298
}
@@ -251,7 +305,13 @@ void lexbor_libxml2_bridge_report_errors(const lexbor_libxml2_bridge_parse_conte
251305
/* See https://github.com/lexbor/lexbor/blob/master/source/lexbor/html/tree/error.h */
252306
lxb_html_tree_error_t *tree_error = error;
253307
if (ctx->tree_error_reporter) {
254-
ctx->tree_error_reporter(ctx->application_data, tree_error, tree_error->line + 1, tree_error->column + 1, tree_error->length);
308+
ctx->tree_error_reporter(
309+
ctx->application_data,
310+
tree_error,
311+
tree_error->line + 1,
312+
tree_error->column + 1,
313+
tree_error->length
314+
);
255315
}
256316
index++;
257317
}

‎ext/dom/html5_parser.h

Lines changed: 37 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
+----------------------------------------------------------------------+
1515
*/
1616

17-
#ifndef CONVERT_H
18-
#define CONVERT_H
17+
#ifndef HTML5_PARSER_H
18+
#define HTML5_PARSER_H
1919

2020
#include <lexbor/html/parser.h>
2121
#include <libxml/tree.h>
@@ -29,8 +29,18 @@ typedef enum {
2929
LEXBOR_LIBXML2_BRIDGE_STATUS_OOM,
3030
} lexbor_libxml2_bridge_status;
3131

32-
typedef void (*lexbor_libxml2_bridge_tokenizer_error_reporter)(void *application_data, lxb_html_tokenizer_error_t *error, size_t offset);
33-
typedef void (*lexbor_libxml2_bridge_tree_error_reporter)(void *application_data, lxb_html_tree_error_t *error, size_t line, size_t column, size_t len);
32+
typedef void (*lexbor_libxml2_bridge_tokenizer_error_reporter)(
33+
void *application_data,
34+
lxb_html_tokenizer_error_t *error,
35+
size_t offset
36+
);
37+
typedef void (*lexbor_libxml2_bridge_tree_error_reporter)(
38+
void *application_data,
39+
lxb_html_tree_error_t *error,
40+
size_t line,
41+
size_t column,
42+
size_t len
43+
);
3444

3545
typedef struct {
3646
bool has_explicit_html_tag;
@@ -49,9 +59,28 @@ typedef struct {
4959
} lexbor_libxml2_bridge_parse_context;
5060

5161
void lexbor_libxml2_bridge_parse_context_init(lexbor_libxml2_bridge_parse_context *ctx);
52-
void lexbor_libxml2_bridge_parse_set_error_callbacks(lexbor_libxml2_bridge_parse_context *ctx, lexbor_libxml2_bridge_tokenizer_error_reporter tokenizer_error_reporter, lexbor_libxml2_bridge_tree_error_reporter tree_error_reporter);
53-
lexbor_libxml2_bridge_status lexbor_libxml2_bridge_convert_document(lxb_html_document_t *document, xmlDocPtr *doc_out, bool compact_text_nodes, bool create_default_ns);
54-
void lexbor_libxml2_bridge_report_errors(const lexbor_libxml2_bridge_parse_context *ctx, lxb_html_parser_t *parser, const lxb_char_t *input_html, size_t chunk_offset, size_t *error_index_offset_tokenizer, size_t *error_index_offset_tree);
55-
void lexbor_libxml2_bridge_copy_observations(lxb_html_tree_t *tree, lexbor_libxml2_bridge_extracted_observations *observations);
62+
void lexbor_libxml2_bridge_parse_set_error_callbacks(
63+
lexbor_libxml2_bridge_parse_context *ctx,
64+
lexbor_libxml2_bridge_tokenizer_error_reporter tokenizer_error_reporter,
65+
lexbor_libxml2_bridge_tree_error_reporter tree_error_reporter
66+
);
67+
lexbor_libxml2_bridge_status lexbor_libxml2_bridge_convert_document(
68+
lxb_html_document_t *document,
69+
xmlDocPtr *doc_out,
70+
bool compact_text_nodes,
71+
bool create_default_ns
72+
);
73+
void lexbor_libxml2_bridge_report_errors(
74+
const lexbor_libxml2_bridge_parse_context *ctx,
75+
lxb_html_parser_t *parser,
76+
const lxb_char_t *input_html,
77+
size_t chunk_offset,
78+
size_t *error_index_offset_tokenizer,
79+
size_t *error_index_offset_tree
80+
);
81+
void lexbor_libxml2_bridge_copy_observations(
82+
lxb_html_tree_t *tree,
83+
lexbor_libxml2_bridge_extracted_observations *observations
84+
);
5685

5786
#endif

‎ext/dom/html5_serializer.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,10 @@ static zend_result dom_html5_serialize_node(dom_html5_serialize_context *ctx, co
336336
zend_result dom_html5_serialize(dom_html5_serialize_context *ctx, const xmlNode *node)
337337
{
338338
/* Step 1. Note that this algorithm serializes children. Only elements, documents, and fragments can have children. */
339-
if (node->type != XML_ELEMENT_NODE && node->type != XML_DOCUMENT_FRAG_NODE && node->type != XML_DOCUMENT_NODE && node->type != XML_HTML_DOCUMENT_NODE) {
339+
if (node->type != XML_ELEMENT_NODE
340+
&& node->type != XML_DOCUMENT_FRAG_NODE
341+
&& node->type != XML_DOCUMENT_NODE
342+
&& node->type != XML_HTML_DOCUMENT_NODE) {
340343
return SUCCESS;
341344
}
342345
if (node->type == XML_ELEMENT_NODE && dom_html5_serializes_as_void(node)) {

0 commit comments

Comments
 (0)