nokolexbor 0.2.3 → 0.2.5

data/ext/nokolexbor/nl_node_set.c

@@ -5,15 +5,15 @@ extern VALUE cNokolexborNode;
 VALUE cNokolexborNodeSet;
 extern rb_data_type_t nl_document_type;
 
-VALUE nl_node_at_css(VALUE self, VALUE selector);
-VALUE nl_node_css(VALUE self, VALUE selector);
-
-typedef VALUE (*nl_node_find_f)(VALUE self, VALUE selector);
+lxb_status_t nl_node_find(VALUE self, VALUE selector, lxb_selectors_cb_f cb, void *ctx);
+void sort_nodes_if_necessary(VALUE selector, lxb_dom_document_t *doc, lexbor_array_t *array);
+lxb_status_t nl_node_at_css_callback(lxb_dom_node_t *node, lxb_css_selector_specificity_t *spec, void *ctx);
+lxb_status_t nl_node_css_callback(lxb_dom_node_t *node, lxb_css_selector_specificity_t *spec, void *ctx);
 
 lxb_status_t
 lexbor_array_push_unique(lexbor_array_t *array, void *value)
 {
-  for (int i = 0; i < array->length; i++)
+  for (size_t i = 0; i < array->length; i++)
     if (array->list[i] == value)
       return LXB_STATUS_STOPPED;
 
@@ -91,7 +91,7 @@ nl_node_set_delete(VALUE self, VALUE rb_node)
   lexbor_array_t *array = nl_rb_node_set_unwrap(self);
   lxb_dom_node_t *node = nl_rb_node_unwrap(rb_node);
 
-  int i;
+  size_t i;
   for (i = 0; i < array->length; i++)
     if (array->list[i] == node)
     {
@@ -113,7 +113,7 @@ nl_node_set_is_include(VALUE self, VALUE rb_node)
   lexbor_array_t *array = nl_rb_node_set_unwrap(self);
   lxb_dom_node_t *node = nl_rb_node_unwrap(rb_node);
 
-  for (int i = 0; i < array->length; i++)
+  for (size_t i = 0; i < array->length; i++)
     if (array->list[i] == node)
     {
       return Qtrue;
@@ -169,7 +169,7 @@ nl_node_set_subseq(VALUE self, long beg, long len)
     }
   }
 
-  for (int j = beg; j < beg + len; ++j)
+  for (long j = beg; j < beg + len; ++j)
   {
     lxb_status_t status = lexbor_array_push(new_array, old_array->list[j]);
     if (status != LXB_STATUS_OK)
@@ -177,7 +177,7 @@ nl_node_set_subseq(VALUE self, long beg, long len)
       nl_raise_lexbor_error(status);
     }
   }
-  return TypedData_Wrap_Struct(cNokolexborNodeSet, &nl_node_set_type, new_array);
+  return nl_rb_node_set_create_with_data(new_array, nl_rb_document_get(self));
 }
 
 static VALUE
@@ -231,7 +231,7 @@ nl_node_set_to_array(VALUE self)
 
   VALUE list = rb_ary_new2(array->length);
   VALUE doc = nl_rb_document_get(self);
-  for (int i = 0; i < array->length; i++)
+  for (size_t i = 0; i < array->length; i++)
   {
     lxb_dom_node_t *node = (lxb_dom_node_t *)array->list[i];
     VALUE rb_node = nl_rb_node_create(node, doc);
@@ -267,7 +267,7 @@ nl_node_set_union(VALUE self, VALUE other)
   memcpy(new_array->list, self_array->list, sizeof(lxb_dom_node_t *) * self_array->length);
   new_array->length = self_array->length;
 
-  for (int i = 0; i < other_array->length; i++)
+  for (size_t i = 0; i < other_array->length; i++)
   {
     lexbor_array_push_unique(new_array, other_array->list[i]);
   }
@@ -275,16 +275,15 @@ nl_node_set_union(VALUE self, VALUE other)
   return nl_rb_node_set_create_with_data(new_array, nl_rb_document_get(self));
 }
 
-static VALUE
-nl_node_set_find(VALUE self, VALUE selector, nl_node_find_f finder)
+static lxb_status_t
+nl_node_set_find(VALUE self, VALUE selector, lxb_selectors_cb_f cb, void *ctx)
 {
-  VALUE rb_doc = nl_rb_document_get(self);
-  lxb_dom_document_t *doc;
-  TypedData_Get_Struct(rb_doc, lxb_dom_document_t, &nl_document_type, doc);
+  lxb_dom_document_t *doc = nl_rb_document_unwrap(nl_rb_document_get(self));
   if (doc == NULL)
   {
     rb_raise(rb_eRuntimeError, "Error getting document");
   }
+  // Wrap direct children with a temporary fragment so that they can be searched
   lxb_dom_document_fragment_t *frag = lxb_dom_document_fragment_interface_create(doc);
   if (frag == NULL)
   {
@@ -302,7 +301,7 @@ nl_node_set_find(VALUE self, VALUE selector, nl_node_find_f finder)
     }
   }
   // Backup original node data and re-group them into a fragment
-  for (int i = 0; i < array->length; i++)
+  for (size_t i = 0; i < array->length; i++)
   {
     lxb_dom_node_t *node = (lxb_dom_node_t *)array->list[i];
     lxb_dom_node_t *backup_node = malloc(sizeof(lxb_dom_node_t));
@@ -320,29 +319,65 @@ nl_node_set_find(VALUE self, VALUE selector, nl_node_find_f finder)
   }
   VALUE rb_frag = nl_rb_node_create(&frag->node, nl_rb_document_get(self));
 
-  VALUE ret = finder(rb_frag, selector);
+  lxb_status_t status = nl_node_find(rb_frag, selector, cb, ctx);
 
   lxb_dom_document_fragment_interface_destroy(frag);
   // Restore original node data
-  for (int i = 0; i < array->length; i++)
+  for (size_t i = 0; i < array->length; i++)
   {
     memcpy(array->list[i], backup_array->list[i], sizeof(lxb_dom_node_t));
     free(backup_array->list[i]);
   }
   lexbor_array_destroy(backup_array, true);
-  return ret;
+
+  return status;
 }
 
 static VALUE
 nl_node_set_at_css(VALUE self, VALUE selector)
 {
-  return nl_node_set_find(self, selector, nl_node_at_css);
+  lexbor_array_t *array = lexbor_array_create();
+  lxb_dom_document_t *doc = nl_rb_document_unwrap(nl_rb_document_get(self));
+
+  lxb_status_t status = nl_node_set_find(self, selector, nl_node_at_css_callback, array);
+
+  if (status != LXB_STATUS_OK)
+  {
+    lexbor_array_destroy(array, true);
+    nl_raise_lexbor_error(status);
+  }
+
+  if (array->length == 0)
+  {
+    lexbor_array_destroy(array, true);
+    return Qnil;
+  }
+
+  sort_nodes_if_necessary(selector, doc, array);
+
+  VALUE ret = nl_rb_node_create(array->list[0], nl_rb_document_get(self));
+
+  lexbor_array_destroy(array, true);
+
+  return ret;
 }
 
 static VALUE
 nl_node_set_css(VALUE self, VALUE selector)
 {
-  return nl_node_set_find(self, selector, nl_node_css);
+  lexbor_array_t *array = lexbor_array_create();
+  lxb_dom_document_t *doc = nl_rb_document_unwrap(nl_rb_document_get(self));
+
+  lxb_status_t status = nl_node_set_find(self, selector, nl_node_css_callback, array);
+  if (status != LXB_STATUS_OK)
+  {
+    lexbor_array_destroy(array, true);
+    nl_raise_lexbor_error(status);
+  }
+
+  sort_nodes_if_necessary(selector, doc, array);
+
+  return nl_rb_node_set_create_with_data(array, nl_rb_document_get(self));
 }
 
 void Init_nl_node_set(void)

data/ext/nokolexbor/nl_xpath_context.c

@@ -7,9 +7,13 @@
 #include "libxml/xpathInternals.h"
 #include "libxml/parserInternals.h"
 
+#define RBSTR_OR_QNIL(_str) (_str ? rb_utf8_str_new_cstr(_str) : Qnil)
+
 extern VALUE mNokolexbor;
 extern VALUE cNokolexborNodeSet;
-VALUE cNokoLexborXpathContext;
+VALUE cNokolexborXpathContext;
+VALUE mNokolexborXpath;
+VALUE cNokolexborXpathSyntaxError;
 
 static void
 free_xml_xpath_context(xmlXPathContextPtr ctx)
@@ -24,7 +28,7 @@ free_xml_xpath_context(xmlXPathContextPtr ctx)
  * Register the namespace with +prefix+ and +uri+.
  */
 static VALUE
-rb_xml_xpath_context_register_ns(VALUE self, VALUE prefix, VALUE uri)
+nl_xpath_context_register_ns(VALUE self, VALUE prefix, VALUE uri)
 {
   xmlXPathContextPtr ctx;
   Data_Get_Struct(self, xmlXPathContext, ctx);
@@ -42,7 +46,7 @@ rb_xml_xpath_context_register_ns(VALUE self, VALUE prefix, VALUE uri)
  * Register the variable +name+ with +value+.
  */
 static VALUE
-rb_xml_xpath_context_register_variable(VALUE self, VALUE name, VALUE value)
+nl_xpath_context_register_variable(VALUE self, VALUE name, VALUE value)
 {
   xmlXPathContextPtr ctx;
   xmlXPathObjectPtr xmlValue;
@@ -69,7 +73,7 @@ xpath2ruby(xmlXPathObjectPtr c_xpath_object, xmlXPathContextPtr ctx, VALUE rb_do
   switch (c_xpath_object->type)
   {
   case XPATH_STRING:
-    rb_retval = rb_utf8_str_new_cstr(c_xpath_object->stringval);
+    rb_retval = rb_utf8_str_new_cstr((const char *)c_xpath_object->stringval);
     xmlFree(c_xpath_object->stringval);
     return rb_retval;
 
@@ -106,6 +110,60 @@ xpath2ruby(xmlXPathObjectPtr c_xpath_object, xmlXPathContextPtr ctx, VALUE rb_do
   }
 }
 
+static VALUE
+nl_xpath_wrap_syntax_error(xmlErrorPtr error)
+{
+  VALUE msg, e;
+
+  msg = (error && error->message) ? rb_utf8_str_new_cstr(error->message) : Qnil;
+
+  e = rb_class_new_instance(
+      1,
+      &msg,
+      cNokolexborXpathSyntaxError);
+
+  if (error)
+  {
+    rb_iv_set(e, "@domain", INT2NUM(error->domain));
+    rb_iv_set(e, "@code", INT2NUM(error->code));
+    rb_iv_set(e, "@level", INT2NUM((short)error->level));
+    rb_iv_set(e, "@file", RBSTR_OR_QNIL(error->file));
+    rb_iv_set(e, "@line", INT2NUM(error->line));
+    rb_iv_set(e, "@str1", RBSTR_OR_QNIL(error->str1));
+    rb_iv_set(e, "@str2", RBSTR_OR_QNIL(error->str2));
+    rb_iv_set(e, "@str3", RBSTR_OR_QNIL(error->str3));
+    rb_iv_set(e, "@int1", INT2NUM(error->int1));
+    rb_iv_set(e, "@column", INT2NUM(error->int2));
+  }
+
+  return e;
+}
+
+static void nl_xpath_error_array_pusher(void *ctx, xmlErrorPtr error)
+{
+  VALUE list = (VALUE)ctx;
+  Check_Type(list, T_ARRAY);
+  rb_ary_push(list, nl_xpath_wrap_syntax_error(error));
+}
+
+static void
+nl_xpath_generic_exception_pusher(void *ctx, const char *msg, ...)
+{
+  VALUE rb_errors = (VALUE)ctx;
+  VALUE rb_message;
+  VALUE rb_exception;
+
+  Check_Type(rb_errors, T_ARRAY);
+
+  va_list args;
+  va_start(args, msg);
+  rb_message = rb_vsprintf(msg, args);
+  va_end(args);
+
+  rb_exception = rb_exc_new_str(cNokolexborXpathSyntaxError, rb_message);
+  rb_ary_push(rb_errors, rb_exception);
+}
+
 /*
  * call-seq:
  *  evaluate(search_path, handler = nil)
@@ -113,7 +171,7 @@ xpath2ruby(xmlXPathObjectPtr c_xpath_object, xmlXPathContextPtr ctx, VALUE rb_do
  * Evaluate the +search_path+ returning an XML::XPath object.
  */
 static VALUE
-rb_xml_xpath_context_evaluate(int argc, VALUE *argv, VALUE self)
+nl_xpath_context_evaluate(int argc, VALUE *argv, VALUE self)
 {
   VALUE search_path, xpath_handler;
   VALUE retval = Qnil;
@@ -137,16 +195,17 @@ rb_xml_xpath_context_evaluate(int argc, VALUE *argv, VALUE self)
   //   xmlXPathRegisterFuncLookup(ctx, handler_lookup, (void *)xpath_handler);
   // }
 
-  // xmlSetStructuredErrorFunc((void *)errors, Nokogiri_error_array_pusher);
-  // xmlSetGenericErrorFunc((void *)errors, generic_exception_pusher);
+  xmlSetStructuredErrorFunc((void *)errors, nl_xpath_error_array_pusher);
+  xmlSetGenericErrorFunc((void *)errors, nl_xpath_generic_exception_pusher);
 
   xpath = xmlXPathEvalExpression(query, ctx);
 
-  // xmlSetStructuredErrorFunc(NULL, NULL);
-  // xmlSetGenericErrorFunc(NULL, NULL);
+  xmlSetStructuredErrorFunc(NULL, NULL);
+  xmlSetGenericErrorFunc(NULL, NULL);
 
   if (xpath == NULL)
   {
+    xmlXPathFreeObject(xpath);
     rb_exc_raise(rb_ary_entry(errors, 0));
   }
 
@@ -156,7 +215,7 @@ rb_xml_xpath_context_evaluate(int argc, VALUE *argv, VALUE self)
     retval = rb_funcall(cNokolexborNodeSet, rb_intern("new"), 1, rb_ary_new());
   }
 
-  // xmlXPathFreeNodeSetList(xpath);
+  xmlXPathFreeObject(xpath);
 
   return retval;
 }
@@ -168,7 +227,7 @@ rb_xml_xpath_context_evaluate(int argc, VALUE *argv, VALUE self)
  * Create a new XPathContext with +node+ as the reference point.
  */
 static VALUE
-rb_xml_xpath_context_new(VALUE klass, VALUE rb_node)
+nl_xpath_context_new(VALUE klass, VALUE rb_node)
 {
   xmlXPathContextPtr ctx;
   VALUE self;
@@ -186,15 +245,21 @@ rb_xml_xpath_context_new(VALUE klass, VALUE rb_node)
 
 void Init_nl_xpath_context(void)
 {
+#ifndef NOKOLEXBOR_ASAN
   xmlMemSetup((xmlFreeFunc)ruby_xfree, (xmlMallocFunc)ruby_xmalloc, (xmlReallocFunc)ruby_xrealloc, ruby_strdup);
+#else
+  xmlMemSetup((xmlFreeFunc)free, (xmlMallocFunc)malloc, (xmlReallocFunc)realloc, strdup);
+#endif
 
-  cNokoLexborXpathContext = rb_define_class_under(mNokolexbor, "XPathContext", rb_cObject);
+  cNokolexborXpathContext = rb_define_class_under(mNokolexbor, "XPathContext", rb_cObject);
+  mNokolexborXpath = rb_define_module_under(mNokolexbor, "XPath");
+  cNokolexborXpathSyntaxError = rb_define_class_under(mNokolexborXpath, "SyntaxError", rb_eStandardError);
 
-  rb_undef_alloc_func(cNokoLexborXpathContext);
+  rb_undef_alloc_func(cNokolexborXpathContext);
 
-  rb_define_singleton_method(cNokoLexborXpathContext, "new", rb_xml_xpath_context_new, 1);
+  rb_define_singleton_method(cNokolexborXpathContext, "new", nl_xpath_context_new, 1);
 
-  rb_define_method(cNokoLexborXpathContext, "evaluate", rb_xml_xpath_context_evaluate, -1);
-  rb_define_method(cNokoLexborXpathContext, "register_variable", rb_xml_xpath_context_register_variable, 2);
-  rb_define_method(cNokoLexborXpathContext, "register_ns", rb_xml_xpath_context_register_ns, 2);
+  rb_define_method(cNokolexborXpathContext, "evaluate", nl_xpath_context_evaluate, -1);
+  rb_define_method(cNokolexborXpathContext, "register_variable", nl_xpath_context_register_variable, 2);
+  rb_define_method(cNokolexborXpathContext, "register_ns", nl_xpath_context_register_ns, 2);
 }

data/ext/nokolexbor/nokolexbor.h

@@ -28,6 +28,8 @@ lxb_inline VALUE nl_rb_document_get(VALUE rb_node_or_doc)
     return rb_iv_get(rb_node_or_doc, "@document");
 }
 
+lxb_dom_document_t * nl_rb_document_unwrap(VALUE rb_doc);
+
 const lxb_char_t *
 lxb_dom_node_name_qualified(lxb_dom_node_t *node, size_t *len);
 

data/ext/nokolexbor/xml_error.c

@@ -3,12 +3,38 @@
 #include <stdarg.h>
 #include "libxml/xmlerror.h"
 
-void *_xmlGenericErrorContext = NULL;
-
-// void * *
-// __xmlGenericErrorContext(void) {
-// 	return (&_xmlGenericErrorContext);
-// }
+#define XML_GET_VAR_STR(msg, str) {				\
+    int       size, prev_size = -1;				\
+    int       chars;						\
+    char      *larger;						\
+    va_list   ap;						\
+								\
+    str = (char *) xmlMalloc(150);				\
+    if (str != NULL) {						\
+								\
+    size = 150;							\
+								\
+    while (size < 64000) {					\
+	va_start(ap, msg);					\
+	chars = vsnprintf(str, size, msg, ap);			\
+	va_end(ap);						\
+	if ((chars > -1) && (chars < size)) {			\
+	    if (prev_size == chars) {				\
+		break;						\
+	    } else {						\
+		prev_size = chars;				\
+	    }							\
+	}							\
+	if (chars > -1)						\
+	    size += chars + 1;					\
+	else							\
+	    size += 100;					\
+	if ((larger = (char *) xmlRealloc(str, size)) == NULL) {\
+	    break;						\
+	}							\
+	str = larger;						\
+    }}								\
+}
 
 /**
  * xmlGenericErrorDefaultFunc:
@@ -20,22 +46,57 @@ void *_xmlGenericErrorContext = NULL;
  */
 void XMLCDECL
 xmlGenericErrorDefaultFunc(void *ctx ATTRIBUTE_UNUSED, const char *msg, ...) {
-    va_list args;
+}
 
-    if (_xmlGenericErrorContext == NULL)
-	_xmlGenericErrorContext = (void *) stderr;
+/**
+ * xmlCopyError:
+ * @from:  a source error
+ * @to:  a target error
+ *
+ * Save the original error to the new place.
+ *
+ * Returns 0 in case of success and -1 in case of error.
+ */
+int
+xmlCopyError(xmlErrorPtr from, xmlErrorPtr to) {
+    char *message, *file, *str1, *str2, *str3;
 
-    va_start(args, msg);
-    vfprintf((FILE *)_xmlGenericErrorContext, msg, args);
-    va_end(args);
-}
+    if ((from == NULL) || (to == NULL))
+        return(-1);
+
+    message = (char *) xmlStrdup((xmlChar *) from->message);
+    file = (char *) xmlStrdup ((xmlChar *) from->file);
+    str1 = (char *) xmlStrdup ((xmlChar *) from->str1);
+    str2 = (char *) xmlStrdup ((xmlChar *) from->str2);
+    str3 = (char *) xmlStrdup ((xmlChar *) from->str3);
 
-// xmlGenericErrorFunc _xmlGenericError = xmlGenericErrorDefaultFunc;
+    if (to->message != NULL)
+        xmlFree(to->message);
+    if (to->file != NULL)
+        xmlFree(to->file);
+    if (to->str1 != NULL)
+        xmlFree(to->str1);
+    if (to->str2 != NULL)
+        xmlFree(to->str2);
+    if (to->str3 != NULL)
+        xmlFree(to->str3);
+    to->domain = from->domain;
+    to->code = from->code;
+    to->level = from->level;
+    to->line = from->line;
+    to->node = from->node;
+    to->int1 = from->int1;
+    to->int2 = from->int2;
+    to->node = from->node;
+    to->ctxt = from->ctxt;
+    to->message = message;
+    to->file = file;
+    to->str1 = str1;
+    to->str2 = str2;
+    to->str3 = str3;
 
-// xmlGenericErrorFunc *
-// __xmlGenericError(void) {
-// 	return (&_xmlGenericError);
-// }
+    return 0;
+}
 
 /**
  * __xmlRaiseError:
@@ -63,16 +124,112 @@ xmlGenericErrorDefaultFunc(void *ctx ATTRIBUTE_UNUSED, const char *msg, ...) {
  */
 void XMLCDECL
 __xmlRaiseError(xmlStructuredErrorFunc schannel,
-              xmlGenericErrorFunc channel, void *data, void *ctx,
-              void *nod, int domain, int code, xmlErrorLevel level,
-              const char *file, int line, const char *str1,
-              const char *str2, const char *str3, int int1, int col,
-	      const char *msg, ...)
+                xmlGenericErrorFunc channel, void *data, void *ctx,
+                void *nod, int domain, int code, xmlErrorLevel level,
+                const char *file, int line, const char *str1,
+                const char *str2, const char *str3, int int1, int col,
+                const char *msg, ...)
 {
-    va_list args;
-    va_start(args, msg);
-    vfprintf(stderr, msg, args);
-    va_end(args);
+    xmlParserCtxtPtr ctxt = NULL;
+    lxb_dom_node_t_ptr node = (lxb_dom_node_t_ptr)nod;
+    char *str = NULL;
+    xmlParserInputPtr input = NULL;
+    xmlErrorPtr to = &xmlLastError;
+    lxb_dom_node_t_ptr baseptr = NULL;
+
+    if (code == XML_ERR_OK)
+        return;
+    if ((xmlGetWarningsDefaultValue == 0) && (level == XML_ERR_WARNING))
+        return;
+    if ((domain == XML_FROM_PARSER) || (domain == XML_FROM_HTML) ||
+        (domain == XML_FROM_DTD) || (domain == XML_FROM_NAMESPACE) ||
+        (domain == XML_FROM_IO) || (domain == XML_FROM_VALID))
+    {
+        ctxt = (xmlParserCtxtPtr)ctx;
+        if ((schannel == NULL) && (ctxt != NULL) && (ctxt->sax != NULL) &&
+            (ctxt->sax->initialized == XML_SAX2_MAGIC) &&
+            (ctxt->sax->serror != NULL))
+        {
+            schannel = ctxt->sax->serror;
+            data = ctxt->userData;
+        }
+    }
+    /*
+     * Check if structured error handler set
+     */
+    if (schannel == NULL)
+    {
+        schannel = xmlStructuredError;
+        /*
+         * if user has defined handler, change data ptr to user's choice
+         */
+        if (schannel != NULL)
+            data = xmlStructuredErrorContext;
+    }
+    /*
+     * Formatting the message
+     */
+    if (msg == NULL)
+    {
+        str = (char *)xmlStrdup(BAD_CAST "No error message provided");
+    }
+    else
+    {
+        XML_GET_VAR_STR(msg, str);
+    }
+
+    /*
+     * specific processing if a parser context is provided
+     */
+    if (ctxt != NULL)
+    {
+        if (file == NULL)
+        {
+            input = ctxt->input;
+            if ((input != NULL) && (input->filename == NULL) &&
+                (ctxt->inputNr > 1))
+            {
+                input = ctxt->inputTab[ctxt->inputNr - 2];
+            }
+            if (input != NULL)
+            {
+                file = input->filename;
+                line = input->line;
+                col = input->col;
+            }
+        }
+        to = &ctxt->lastError;
+    }
+
+    /*
+     * Save the information about the error
+     */
+    xmlResetError(to);
+    to->domain = domain;
+    to->code = code;
+    to->message = str;
+    to->level = level;
+    if (file != NULL)
+        to->file = (char *)xmlStrdup((const xmlChar *)file);
+    to->line = line;
+    if (str1 != NULL)
+        to->str1 = (char *)xmlStrdup((const xmlChar *)str1);
+    if (str2 != NULL)
+        to->str2 = (char *)xmlStrdup((const xmlChar *)str2);
+    if (str3 != NULL)
+        to->str3 = (char *)xmlStrdup((const xmlChar *)str3);
+    to->int1 = int1;
+    to->int2 = col;
+    to->node = node;
+    to->ctxt = ctx;
+
+    if (to != &xmlLastError)
+        xmlCopyError(to, &xmlLastError);
+
+    if (schannel != NULL)
+    {
+        schannel(data, to);
+    }
 }
 
 /**
@@ -131,4 +288,45 @@ __xmlSimpleError(int domain, int code, lxb_dom_node_t_ptr node,
 			code, XML_ERR_ERROR, NULL, 0, extra,
 			NULL, NULL, 0, 0, msg, extra);
     }
+}
+
+/**
+ * xmlSetGenericErrorFunc:
+ * @ctx:  the new error handling context
+ * @handler:  the new handler function
+ *
+ * Function to reset the handler and the error context for out of
+ * context error messages.
+ * This simply means that @handler will be called for subsequent
+ * error messages while not parsing nor validating. And @ctx will
+ * be passed as first argument to @handler
+ * One can simply force messages to be emitted to another FILE * than
+ * stderr by setting @ctx to this file handle and @handler to NULL.
+ * For multi-threaded applications, this must be set separately for each thread.
+ */
+void
+xmlSetGenericErrorFunc(void *ctx, xmlGenericErrorFunc handler) {
+    xmlGenericErrorContext = ctx;
+    if (handler != NULL)
+	xmlGenericError = handler;
+    else
+	xmlGenericError = xmlGenericErrorDefaultFunc;
+}
+
+/**
+ * xmlSetStructuredErrorFunc:
+ * @ctx:  the new error handling context
+ * @handler:  the new handler function
+ *
+ * Function to reset the handler and the error context for out of
+ * context structured error messages.
+ * This simply means that @handler will be called for subsequent
+ * error messages while not parsing nor validating. And @ctx will
+ * be passed as first argument to @handler
+ * For multi-threaded applications, this must be set separately for each thread.
+ */
+void
+xmlSetStructuredErrorFunc(void *ctx, xmlStructuredErrorFunc handler) {
+    xmlStructuredErrorContext = ctx;
+    xmlStructuredError = handler;
 }

data/lib/nokolexbor/node.rb

@@ -119,8 +119,8 @@ module Nokolexbor
     end
 
     def each
-      attributes.each do |node|
-        yield [node.name, node.value]
+      attributes.each do |name, node|
+        yield [name, node.value]
       end
     end
 

data/lib/nokolexbor/node_set.rb

@@ -69,9 +69,13 @@ module Nokolexbor
       self.each(&:remove)
     end
 
-    alias_method :destroy, :remove
+    alias_method :unlink, :remove
     alias_method :to_ary, :to_a
 
+    def destroy
+      self.each(&:destroy)
+    end
+
     def pop
       return nil if length == 0
 

data/lib/nokolexbor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Nokolexbor
-  VERSION = '0.2.3'
+  VERSION = '0.2.5'
 end