makiri 0.2.0 → 0.4.0

data/vendor/lexbor/source/lexbor/html/serialize.h

@@ -27,7 +27,8 @@ enum lxb_html_serialize_opt {
     LXB_HTML_SERIALIZE_OPT_WITHOUT_CLOSING     = 0x08,
     LXB_HTML_SERIALIZE_OPT_TAG_WITH_NS         = 0x10,
     LXB_HTML_SERIALIZE_OPT_WITHOUT_TEXT_INDENT = 0x20,
-    LXB_HTML_SERIALIZE_OPT_FULL_DOCTYPE        = 0x40
+    LXB_HTML_SERIALIZE_OPT_FULL_DOCTYPE        = 0x40,
+    LXB_HTML_SERIALIZE_OPT_HTML5TEST           = 0x80
 };
 
 

data/vendor/lexbor/source/lexbor/html/tokenizer.h

@@ -310,7 +310,7 @@ lxb_html_tokenizer_temp_append_data(lxb_html_tokenizer_t *tkz,
 {
     size_t size = data - tkz->begin;
 
-    if ((tkz->pos + size) > tkz->end) {
+    if (size > (size_t)(tkz->end - tkz->pos)) {
         if(lxb_html_tokenizer_temp_realloc(tkz, size)) {
             return tkz->status;
         }
@@ -325,7 +325,7 @@ lxb_inline lxb_status_t
 lxb_html_tokenizer_temp_append(lxb_html_tokenizer_t *tkz,
                                const lxb_char_t *data, size_t size)
 {
-    if ((tkz->pos + size) > tkz->end) {
+    if (size > (size_t)(tkz->end - tkz->pos)) {
         if(lxb_html_tokenizer_temp_realloc(tkz, size)) {
             return tkz->status;
         }

data/vendor/lexbor/source/lexbor/html/tree/insertion_mode/in_body.c

@@ -1691,7 +1691,7 @@ lxb_html_tree_insertion_mode_in_body_rprt(lxb_html_tree_t *tree,
     node = lxb_html_tree_current_node(tree);
 
     if (lxb_html_tree_node_is(node, LXB_TAG_RTC) == false
-        || lxb_html_tree_node_is(node, LXB_TAG_RUBY) == false)
+        && lxb_html_tree_node_is(node, LXB_TAG_RUBY) == false)
     {
         lxb_html_tree_parse_error(tree, token,
                                   LXB_HTML_RULES_ERROR_MIELINOPELST);

data/vendor/lexbor/source/lexbor/html/tree.c

@@ -462,8 +462,8 @@ lxb_html_tree_append_attributes(lxb_html_tree_t *tree,
     doc = lxb_html_interface_document(element->node.owner_document);
 
     while (token_attr != NULL) {
-        attr = lxb_dom_element_attr_by_local_name_data(element,
-                                                       token_attr->name);
+        attr = lxb_dom_element_attr_by_local_name_ns_data(element,
+                                                          token_attr->name, ns);
         if (attr != NULL) {
             token_attr = token_attr->next;
             continue;
@@ -1184,7 +1184,7 @@ lxb_html_tree_element_in_scope_h123456(lxb_html_tree_t *tree)
                 break;
         }
 
-        if (lxb_html_tag_is_category(node->local_name, LXB_NS_HTML,
+        if (lxb_html_tag_is_category(node->local_name, node->ns,
                                      LXB_HTML_TAG_CATEGORY_SCOPE))
         {
             return NULL;
@@ -1220,7 +1220,7 @@ lxb_html_tree_element_in_scope_tbody_thead_tfoot(lxb_html_tree_t *tree)
                 break;
         }
 
-        if (lxb_html_tag_is_category(node->local_name, LXB_NS_HTML,
+        if (lxb_html_tag_is_category(node->local_name, node->ns,
                                      LXB_HTML_TAG_CATEGORY_SCOPE_TABLE))
         {
             return NULL;
@@ -1255,7 +1255,7 @@ lxb_html_tree_element_in_scope_td_th(lxb_html_tree_t *tree)
                 break;
         }
 
-        if (lxb_html_tag_is_category(node->local_name, LXB_NS_HTML,
+        if (lxb_html_tag_is_category(node->local_name, node->ns,
                                      LXB_HTML_TAG_CATEGORY_SCOPE_TABLE))
         {
             return NULL;
@@ -1290,7 +1290,7 @@ lxb_html_tree_element_in_scope_option_optgroup(lxb_html_tree_t *tree)
                 break;
         }
 
-        if (lxb_html_tag_is_category(node->local_name, LXB_NS_HTML,
+        if (lxb_html_tag_is_category(node->local_name, node->ns,
                                      LXB_HTML_TAG_CATEGORY_SCOPE))
         {
             return NULL;

data/vendor/lexbor/source/lexbor/selectors/selectors.c

@@ -1310,7 +1310,9 @@ lxb_selectors_match(lxb_selectors_t *selectors, lxb_selectors_entry_t *entry,
             }
 
             return lxb_selectors_match_class(element->attr_class->value,
-                                             &entry->selector->name, true);
+                                             &entry->selector->name,
+                                             node->owner_document->compat_mode
+                                             == LXB_DOM_DOCUMENT_CMODE_QUIRKS);
 
         case LXB_CSS_SELECTOR_TYPE_ATTRIBUTE:
             return lxb_selectors_match_attribute(entry->selector, node, entry);
@@ -1368,8 +1370,15 @@ lxb_selectors_match_id(const lxb_css_selector_t *selector, lxb_dom_node_t *node)
     trg = element->attr_id->value;
     src = &selector->name;
 
-    return trg->length == src->length
-           && lexbor_str_data_ncasecmp(trg->data, src->data, src->length);
+    if (trg->length != src->length) {
+        return false;
+    }
+
+    if (node->owner_document->compat_mode == LXB_DOM_DOCUMENT_CMODE_QUIRKS) {
+        return lexbor_str_data_ncasecmp(trg->data, src->data, src->length);
+    }
+
+    return lexbor_str_data_ncmp(trg->data, src->data, src->length);
 }
 
 static bool

data/vendor/lexbor/source/lexbor/url/base.h

@@ -17,7 +17,7 @@ extern "C" {
 
 
 #define LXB_URL_VERSION_MAJOR 0
-#define LXB_URL_VERSION_MINOR 4
+#define LXB_URL_VERSION_MINOR 5
 #define LXB_URL_VERSION_PATCH 0
 
 #define LXB_URL_VERSION_STRING LEXBOR_STRINGIZE(LXB_URL_VERSION_MAJOR) "."    \

data/vendor/lexbor/source/lexbor/url/url.c

@@ -499,6 +499,7 @@ lxb_url_scheme_length = sizeof(lxb_url_scheme_res) / sizeof(lxb_url_scheme_data_
             if (tmp == NULL) {                                                \
                 return NULL;                                                  \
             }                                                                 \
+            memcpy(tmp, (sbuf_begin), offset);                                \
         }                                                                     \
         else {                                                                \
             tmp = lexbor_realloc((sbuf_begin), new_len);                      \
@@ -509,7 +510,7 @@ lxb_url_scheme_length = sizeof(lxb_url_scheme_res) / sizeof(lxb_url_scheme_data_
         }                                                                     \
                                                                               \
         (sbuf) = tmp + offset;                                                \
-        (last) = sbuf + lst;                                                  \
+        (last) = tmp + lst;                                                   \
         (sbuf_begin) = tmp;                                                   \
         (sbuf_end) = tmp + new_len;                                           \
     }                                                                         \
@@ -860,7 +861,7 @@ lxb_url_is_url_codepoint(lxb_codepoint_t cp)
     return lxb_url_codepoint_alphanumeric[(lxb_char_t) cp] != 0xFF;
 }
 
-lxb_inline bool
+bool
 lxb_url_is_special(const lxb_url_t *url)
 {
     return url->scheme.type != LXB_URL_SCHEMEL_TYPE__UNKNOWN;
@@ -5080,6 +5081,8 @@ lxb_url_search_params_parse(lxb_url_search_params_t *search_params,
             return status;
         }
 
+        last = entry;
+
         lexbor_str_init(&entry->value, mraw, 0);
         if (entry->value.data == NULL) {
             return LXB_STATUS_ERROR_MEMORY_ALLOCATION;

data/vendor/lexbor/source/lexbor/url/url.h

@@ -763,6 +763,15 @@ LXB_API lxb_status_t
 lxb_url_search_params_serialize(lxb_url_search_params_t *search_params,
                                 lexbor_callback_f cb, void *ctx);
 
+/**
+ * Returns whether the URL is special.
+ *
+ * @param[in] lxb_url_t *. Cannot be NULL.
+ * @return true if URL is special, false otherwise.
+ */
+LXB_API bool
+lxb_url_is_special(const lxb_url_t *url);
+
 /*
  * Inline functions.
  */

data/vendor/lexbor/version

@@ -1 +1 @@
-LEXBOR_VERSION=3.0.0
+LEXBOR_VERSION=3.1.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: makiri
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - takahashim
@@ -65,8 +65,10 @@ extra_rdoc_files: []
 files:
 - ".github/workflows/ci.yml"
 - ".github/workflows/conformance.yml"
+- ".github/workflows/libfuzzer.yml"
 - ".github/workflows/release.yml"
 - ".github/workflows/security.yml"
+- ".github/workflows/valgrind.yml"
 - ".gitmodules"
 - CHANGELOG.md
 - LICENSE
@@ -83,16 +85,27 @@ files:
 - ext/makiri/core/mkr_core.c
 - ext/makiri/core/mkr_core.h
 - ext/makiri/core/mkr_hash.h
+- ext/makiri/core/mkr_span.h
 - ext/makiri/core/mkr_text.h
+- ext/makiri/core/mkr_utf8.c
+- ext/makiri/core/mkr_utf8.h
 - ext/makiri/extconf.rb
+- ext/makiri/fuzz/Makefile
+- ext/makiri/fuzz/check_fuzzer.cc
+- ext/makiri/fuzz/xml_fuzz.c
+- ext/makiri/fuzz/xpath_fuzz.c
 - ext/makiri/glue/glue.h
-- ext/makiri/glue/ruby_css.c
 - ext/makiri/glue/ruby_doc.c
-- ext/makiri/glue/ruby_mutate.c
+- ext/makiri/glue/ruby_html_css.c
+- ext/makiri/glue/ruby_html_mutate.c
+- ext/makiri/glue/ruby_html_node.c
+- ext/makiri/glue/ruby_html_serialize.c
 - ext/makiri/glue/ruby_node.c
 - ext/makiri/glue/ruby_node_set.c
-- ext/makiri/glue/ruby_serialize.c
+- ext/makiri/glue/ruby_xml.c
+- ext/makiri/glue/ruby_xml_node.c
 - ext/makiri/glue/ruby_xpath.c
+- ext/makiri/glue/ruby_xpath.h
 - ext/makiri/lexbor_compat/compat.h
 - ext/makiri/lexbor_compat/compat_internal.h
 - ext/makiri/lexbor_compat/dom_index.c
@@ -102,33 +115,64 @@ files:
 - ext/makiri/lexbor_compat/utf8_input.c
 - ext/makiri/makiri.c
 - ext/makiri/makiri.h
+- ext/makiri/xml/mkr_xml.h
+- ext/makiri/xml/mkr_xml_chars.c
+- ext/makiri/xml/mkr_xml_index.c
+- ext/makiri/xml/mkr_xml_index.h
+- ext/makiri/xml/mkr_xml_mutate.c
+- ext/makiri/xml/mkr_xml_mutate.h
+- ext/makiri/xml/mkr_xml_node.c
+- ext/makiri/xml/mkr_xml_node.h
+- ext/makiri/xml/mkr_xml_tree.c
+- ext/makiri/xpath/mkr_css.c
+- ext/makiri/xpath/mkr_css.h
 - ext/makiri/xpath/mkr_xpath.c
 - ext/makiri/xpath/mkr_xpath.h
-- ext/makiri/xpath/mkr_xpath_eval.c
-- ext/makiri/xpath/mkr_xpath_funcs.c
+- ext/makiri/xpath/mkr_xpath_engine_html.c
+- ext/makiri/xpath/mkr_xpath_engine_xml.c
+- ext/makiri/xpath/mkr_xpath_eval_body.h
+- ext/makiri/xpath/mkr_xpath_funcs_body.h
 - ext/makiri/xpath/mkr_xpath_internal.h
 - ext/makiri/xpath/mkr_xpath_lex.c
+- ext/makiri/xpath/mkr_xpath_node_access_html.h
+- ext/makiri/xpath/mkr_xpath_node_access_xml.h
+- ext/makiri/xpath/mkr_xpath_number.c
 - ext/makiri/xpath/mkr_xpath_parse.c
-- ext/makiri/xpath/mkr_xpath_value.c
+- ext/makiri/xpath/mkr_xpath_prelude_html.h
+- ext/makiri/xpath/mkr_xpath_prelude_xml.h
+- ext/makiri/xpath/mkr_xpath_shared.c
+- ext/makiri/xpath/mkr_xpath_value_body.h
+- ext/makiri/xpath/mkr_xpath_xml_selftest.c
 - lib/makiri.rb
-- lib/makiri/attribute.rb
-- lib/makiri/cdata.rb
+- lib/makiri/attr.rb
+- lib/makiri/cdata_section.rb
 - lib/makiri/comment.rb
+- lib/makiri/compat_aliases.rb
 - lib/makiri/css.rb
 - lib/makiri/document.rb
 - lib/makiri/document_fragment.rb
 - lib/makiri/document_type.rb
 - lib/makiri/element.rb
+- lib/makiri/html.rb
+- lib/makiri/html/document.rb
+- lib/makiri/html/node_methods.rb
 - lib/makiri/node.rb
 - lib/makiri/node_set.rb
 - lib/makiri/processing_instruction.rb
 - lib/makiri/text.rb
 - lib/makiri/version.rb
+- lib/makiri/xml.rb
+- lib/makiri/xml/builder.rb
+- lib/makiri/xml/document.rb
+- lib/makiri/xml/node_methods.rb
 - lib/makiri/xpath.rb
 - lib/makiri/xpath_context.rb
 - script/build_native_gem.rb
+- script/check_alloc_failures.rb
 - script/check_c_safety.rb
 - script/check_c_safety_allowlist.yml
+- script/check_leaks.rb
+- script/leaks_harness.rb
 - sig/makiri.rbs
 - vendor/lexbor/.travis.yml
 - vendor/lexbor/CHANGELOG.md

data/ext/makiri/glue/ruby_css.c

@@ -1,185 +0,0 @@
-#include "glue.h"
-
-#include <lexbor/css/css.h>
-#include <lexbor/selectors/selectors.h>
-
-/*
- * CSS selector queries, delegated to Lexbor's lxb_selectors engine.
- *
- *   Node#css(selector)    -> NodeSet (descendants matching, document order)
- *   Node#at_css(selector) -> first matching descendant, or nil
- *
- * Selectors are compiled per call (a per-context cache is a later concern).
- * A malformed selector raises Makiri::CSS::SyntaxError.
- */
-
-typedef struct {
-    VALUE           set;
-    lxb_dom_node_t *root;       /* excluded from results: css is descendant-only */
-    size_t          count;
-    int             overflow;
-    int             first_only;
-} mkr_css_ctx_t;
-
-static lxb_status_t
-mkr_css_find_cb(lxb_dom_node_t *node, lxb_css_selector_specificity_t spec,
-                void *ctx_)
-{
-    (void)spec;
-    mkr_css_ctx_t *c = (mkr_css_ctx_t *)ctx_;
-
-    if (node == c->root) {
-        return LXB_STATUS_OK; /* descendant-only, like Nokogiri's node.css */
-    }
-    if (c->count >= MKR_NODE_SET_MAX) {
-        c->overflow = 1;
-        return LXB_STATUS_STOP; /* fail closed without raising mid-traversal */
-    }
-
-    mkr_node_set_push(c->set, node);
-    c->count++;
-    return c->first_only ? LXB_STATUS_STOP : LXB_STATUS_OK;
-}
-
-/* Callback for matches?: signals that the node matched the selector. */
-static lxb_status_t
-mkr_css_match_cb(lxb_dom_node_t *node, lxb_css_selector_specificity_t spec,
-                 void *ctx_)
-{
-    (void)node; (void)spec;
-    *(int *)ctx_ = 1;
-    return LXB_STATUS_STOP;
-}
-
-/* Compile +rb_selector+, hand the established engine + parsed list to +run+
- * (which performs the actual find / match_node against +node+), then tear the
- * Lexbor CSS object graph down in the required order and fail closed. Centralises
- * the engine lifecycle so the construction/teardown order — a delicate
- * Lexbor-specific detail — lives in exactly one place. Raises
- * Makiri::CSS::SyntaxError on a bad selector, Makiri::Error on engine init
- * failure; any result-specific limits are checked by the caller after return. */
-static void
-mkr_with_compiled_selector(VALUE rb_selector, lxb_dom_node_t *node,
-                           lxb_status_t (*run)(lxb_selectors_t *, lxb_dom_node_t *,
-                                               lxb_css_selector_list_t *, void *),
-                           void *u)
-{
-    mkr_ruby_borrowed_text_t sv = mkr_ruby_verified_text(rb_selector, "CSS selector");
-    const lxb_char_t *s = (const lxb_char_t *)sv.ptr;
-    size_t slen = sv.len;
-
-    /* Lexbor CSS object graph: memory arena -> parser -> selector parser, plus
-     * the traversal engine. All transient; torn down before we return. */
-    lxb_css_memory_t    *mem       = lxb_css_memory_create();
-    lxb_css_parser_t    *parser    = lxb_css_parser_create();
-    lxb_css_selectors_t *css_sel   = lxb_css_selectors_create();
-    lxb_selectors_t     *selectors = lxb_selectors_create();
-    lxb_css_selector_list_t *list  = NULL;
-
-    int ok = (mem != NULL && parser != NULL && css_sel != NULL && selectors != NULL);
-    if (ok) {
-        ok = (lxb_css_memory_init(mem, 128) == LXB_STATUS_OK)
-          && (lxb_css_parser_init(parser, NULL) == LXB_STATUS_OK)
-          && (lxb_css_selectors_init(css_sel) == LXB_STATUS_OK)
-          && (lxb_selectors_init(selectors) == LXB_STATUS_OK);
-    }
-
-    int syntax_error = 0;
-    if (ok) {
-        lxb_css_parser_memory_set(parser, mem);
-        lxb_css_parser_selectors_set(parser, css_sel);
-        list = lxb_css_selectors_parse(parser, s, slen);
-        if (list == NULL || parser->status != LXB_STATUS_OK) {
-            syntax_error = 1;
-        } else {
-            (void)run(selectors, node, list, u);
-        }
-    }
-
-    /* Teardown (order mirrors Lexbor's own examples). Destroying the memory
-     * arena frees the parsed selector list, so we do not free it separately. */
-    if (selectors != NULL) lxb_selectors_destroy(selectors, true);
-    if (parser != NULL)    lxb_css_parser_destroy(parser, true);
-    if (mem != NULL)       lxb_css_memory_destroy(mem, true);
-    if (css_sel != NULL)   lxb_css_selectors_destroy(css_sel, true);
-
-    if (!ok) {
-        rb_raise(mkr_eError, "failed to initialise CSS selector engine");
-    }
-    if (syntax_error) {
-        rb_raise(mkr_eCSSSyntaxError, "invalid CSS selector: %" PRIsVALUE, sv.value);
-    }
-    RB_GC_GUARD(sv.value);
-}
-
-/* find: collect descendants matching the selector (MATCH_FIRST dedups a node
- * that matches several selectors in a comma list). */
-static lxb_status_t
-mkr_run_find(lxb_selectors_t *selectors, lxb_dom_node_t *root,
-             lxb_css_selector_list_t *list, void *u)
-{
-    lxb_selectors_opt_set(selectors, LXB_SELECTORS_OPT_MATCH_FIRST);
-    return lxb_selectors_find(selectors, root, list, mkr_css_find_cb, u);
-}
-
-/* match_node: does THIS node match? */
-static lxb_status_t
-mkr_run_match(lxb_selectors_t *selectors, lxb_dom_node_t *node,
-              lxb_css_selector_list_t *list, void *u)
-{
-    return lxb_selectors_match_node(selectors, node, list, mkr_css_match_cb, u);
-}
-
-/* Run +selector+ against self's subtree. first_only stops after one match.
- * Raises Makiri::CSS::SyntaxError on a bad selector, Makiri::Error on
- * allocation failure or an over-large result. */
-static VALUE
-mkr_css_query(VALUE self, VALUE rb_selector, int first_only)
-{
-    lxb_dom_node_t *root = mkr_node_unwrap(self);
-    VALUE document = mkr_node_document(self);
-    VALUE set = mkr_node_set_new(document);
-
-    mkr_css_ctx_t ctx = { .set = set, .root = root, .count = 0,
-                          .overflow = 0, .first_only = first_only };
-    mkr_with_compiled_selector(rb_selector, root, mkr_run_find, &ctx);
-
-    if (ctx.overflow) {
-        rb_raise(mkr_eError, "CSS result set exceeded the node limit (%u)",
-                 MKR_NODE_SET_MAX);
-    }
-    return set;
-}
-
-/* Node#matches?(selector): does THIS node match the CSS selector? (Like
- * Nokogiri — tested against the node itself, not its descendants.) A malformed
- * selector raises Makiri::CSS::SyntaxError. */
-static VALUE
-mkr_node_matches(VALUE self, VALUE rb_selector)
-{
-    lxb_dom_node_t *node = mkr_node_unwrap(self);
-    int matched = 0;
-    mkr_with_compiled_selector(rb_selector, node, mkr_run_match, &matched);
-    return matched ? Qtrue : Qfalse;
-}
-
-static VALUE
-mkr_node_css(VALUE self, VALUE rb_selector)
-{
-    return mkr_css_query(self, rb_selector, 0);
-}
-
-static VALUE
-mkr_node_at_css(VALUE self, VALUE rb_selector)
-{
-    VALUE set = mkr_css_query(self, rb_selector, 1);
-    return rb_funcall(set, rb_intern("first"), 0);
-}
-
-void
-mkr_init_css(void)
-{
-    rb_define_method(mkr_cNode, "css",     mkr_node_css,     1);
-    rb_define_method(mkr_cNode, "at_css",  mkr_node_at_css,  1);
-    rb_define_method(mkr_cNode, "matches?", mkr_node_matches, 1);
-}

data/ext/makiri/glue/ruby_serialize.c

@@ -1,92 +0,0 @@
-#include "glue.h"
-
-#include <lexbor/html/serialize.h>
-
-/*
- * HTML serialization, delegated to Lexbor's serializer.
- *
- *   Node#to_html / #to_s / #outer_html -> the node and its subtree (outer)
- *   Node#inner_html                    -> the node's children only (inner)
- *
- * We use the callback variants so output streams straight into a Ruby String;
- * Lexbor emits UTF-8, which is the string's encoding.
- *
- * Mutating setters (inner_html=, outer_html=) arrive with the v0.2 mutation
- * API and are not defined here.
- */
-
-static lxb_status_t
-mkr_serialize_cb(const lxb_char_t *data, size_t len, void *ctx)
-{
-    rb_str_cat((VALUE)ctx, (const char *)data, (long)len);
-    return LXB_STATUS_OK;
-}
-
-/* Read the optional `pretty:` keyword. */
-static int
-mkr_serialize_pretty_opt(int argc, VALUE *argv)
-{
-    VALUE opts = Qnil;
-    rb_scan_args(argc, argv, "0:", &opts);
-    if (NIL_P(opts)) {
-        return 0;
-    }
-    return RTEST(rb_hash_aref(opts, ID2SYM(rb_intern("pretty"))));
-}
-
-/* Outer HTML: the node itself plus its descendants.
- * Pass `pretty: true` for indented output. */
-static VALUE
-mkr_node_to_html(int argc, VALUE *argv, VALUE self)
-{
-    int pretty = mkr_serialize_pretty_opt(argc, argv);
-    lxb_dom_node_t *node = mkr_node_unwrap(self);
-    VALUE str = rb_utf8_str_new(NULL, 0);
-
-    /* A document fragment has no tag of its own; "outer" == its children, so
-     * the deep (children) serializer is the right one (the tree serializer
-     * rejects a fragment node). */
-    int deep = (node->type == LXB_DOM_NODE_TYPE_DOCUMENT_FRAGMENT);
-    lxb_status_t st;
-    if (deep) {
-        st = pretty
-            ? lxb_html_serialize_pretty_deep_cb(node, LXB_HTML_SERIALIZE_OPT_UNDEF,
-                                                0, mkr_serialize_cb, (void *)str)
-            : lxb_html_serialize_deep_cb(node, mkr_serialize_cb, (void *)str);
-    } else {
-        st = pretty
-            ? lxb_html_serialize_pretty_tree_cb(node, LXB_HTML_SERIALIZE_OPT_UNDEF,
-                                                0, mkr_serialize_cb, (void *)str)
-            : lxb_html_serialize_tree_cb(node, mkr_serialize_cb, (void *)str);
-    }
-    if (st != LXB_STATUS_OK) {
-        rb_raise(mkr_eError, "HTML serialization failed");
-    }
-    return str;
-}
-
-/* Inner HTML: the node's children, without the node's own tag. */
-static VALUE
-mkr_node_inner_html(int argc, VALUE *argv, VALUE self)
-{
-    int pretty = mkr_serialize_pretty_opt(argc, argv);
-    lxb_dom_node_t *node = mkr_node_unwrap(self);
-    VALUE str = rb_utf8_str_new(NULL, 0);
-    lxb_status_t st = pretty
-        ? lxb_html_serialize_pretty_deep_cb(node, LXB_HTML_SERIALIZE_OPT_UNDEF,
-                                            0, mkr_serialize_cb, (void *)str)
-        : lxb_html_serialize_deep_cb(node, mkr_serialize_cb, (void *)str);
-    if (st != LXB_STATUS_OK) {
-        rb_raise(mkr_eError, "HTML serialization failed");
-    }
-    return str;
-}
-
-void
-mkr_init_serialize(void)
-{
-    rb_define_method(mkr_cNode, "to_html",    mkr_node_to_html,    -1);
-    rb_define_method(mkr_cNode, "to_s",       mkr_node_to_html,    -1);
-    rb_define_method(mkr_cNode, "outer_html", mkr_node_to_html,    -1);
-    rb_define_method(mkr_cNode, "inner_html", mkr_node_inner_html, -1);
-}