libxml-ruby 5.0.6 → 6.0.0

data/ext/libxml/ruby_xml_parser_context.c

@@ -15,21 +15,28 @@ static ID IO_ATTR;
  * a document is parsed.
  */
 
-static void rxml_parser_context_free(xmlParserCtxtPtr ctxt)
+static void rxml_parser_context_free(void* data)
 {
+  xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr)data;
   xmlFreeParserCtxt(ctxt);
 }
 
+const rb_data_type_t rxml_parser_context_type = {
+  "LibXML::XML::Parser::Context",
+  {NULL, rxml_parser_context_free, NULL},
+  NULL, NULL, 0
+};
+
 static VALUE rxml_parser_context_wrap(xmlParserCtxtPtr ctxt)
 {
-  return Data_Wrap_Struct(cXMLParserContext, NULL, rxml_parser_context_free, ctxt);
+  return TypedData_Wrap_Struct(cXMLParserContext, &rxml_parser_context_type, ctxt);
 }
 
 
 static VALUE rxml_parser_context_alloc(VALUE klass)
 {
   xmlParserCtxtPtr ctxt = xmlNewParserCtxt();
-  return Data_Wrap_Struct(klass, NULL, rxml_parser_context_free, ctxt);
+  return TypedData_Wrap_Struct(klass, &rxml_parser_context_type, ctxt);
 }
 
 /* call-seq:
@@ -53,7 +60,7 @@ static VALUE rxml_parser_context_document(int argc, VALUE* argv, VALUE klass)
   xmlDocPtr xdoc;
   xmlChar *buffer;
   int length;
-  Data_Get_Struct(document, xmlDoc, xdoc);
+  TypedData_Get_Struct(document, xmlDoc, &rxml_document_data_type, xdoc);
   xmlDocDumpFormatMemoryEnc(xdoc, &buffer, &length, (const char*)xdoc->encoding, 0);
 
   xmlParserCtxtPtr ctxt = xmlCreateDocParserCtxt(buffer);
@@ -194,7 +201,7 @@ static VALUE rxml_parser_context_io(int argc, VALUE* argv, VALUE klass)
 static VALUE rxml_parser_context_base_uri_get(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   if (ctxt->input && ctxt->input->filename)
     return rxml_new_cstr((const xmlChar*)ctxt->input->filename, ctxt->encoding);
@@ -211,7 +218,7 @@ static VALUE rxml_parser_context_base_uri_get(VALUE self)
 static VALUE rxml_parser_context_base_uri_set(VALUE self, VALUE url)
 {
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   Check_Type(url, T_STRING);
 
@@ -235,7 +242,7 @@ static VALUE rxml_parser_context_close(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
   xmlParserInputPtr xinput;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   while ((xinput = inputPop(ctxt)) != NULL)
   {
@@ -253,7 +260,7 @@ static VALUE rxml_parser_context_close(VALUE self)
 static VALUE rxml_parser_context_data_directory_get(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   if (ctxt->directory == NULL)
     return (Qnil);
@@ -270,7 +277,7 @@ static VALUE rxml_parser_context_data_directory_get(VALUE self)
 static VALUE rxml_parser_context_depth_get(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   return (INT2NUM(ctxt->depth));
 }
@@ -284,7 +291,7 @@ static VALUE rxml_parser_context_depth_get(VALUE self)
 static VALUE rxml_parser_context_disable_cdata_q(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   /* LibXML controls this internally with the default SAX handler. */
   if (ctxt->sax && ctxt->sax->cdataBlock)
@@ -302,7 +309,7 @@ static VALUE rxml_parser_context_disable_cdata_q(VALUE self)
 static VALUE rxml_parser_context_disable_cdata_set(VALUE self, VALUE value)
 {
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   if (ctxt->sax == NULL)
     rb_raise(rb_eRuntimeError, "Sax handler is not yet set");
@@ -326,7 +333,7 @@ static VALUE rxml_parser_context_disable_cdata_set(VALUE self, VALUE value)
 static VALUE rxml_parser_context_disable_sax_q(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   if (ctxt->disableSAX)
     return (Qtrue);
@@ -343,7 +350,7 @@ static VALUE rxml_parser_context_disable_sax_q(VALUE self)
 static VALUE rxml_parser_context_docbook_q(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   if (ctxt->html == 2) // TODO check this
     return (Qtrue);
@@ -361,7 +368,7 @@ static VALUE rxml_parser_context_docbook_q(VALUE self)
 static VALUE rxml_parser_context_encoding_get(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
   return INT2NUM(xmlParseCharEncoding((const char*)ctxt->encoding));
 }
 
@@ -381,7 +388,7 @@ static VALUE rxml_parser_context_encoding_set(VALUE self, VALUE encoding)
   if (!hdlr)
     rb_raise(rb_eArgError, "Unknown encoding: %i", NUM2INT(encoding));
 
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
   result = xmlSwitchToEncoding(ctxt, hdlr);
 
   if (result != 0)
@@ -403,7 +410,7 @@ static VALUE rxml_parser_context_encoding_set(VALUE self, VALUE encoding)
 static VALUE rxml_parser_context_errno_get(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   return (INT2NUM(ctxt->errNo));
 }
@@ -417,7 +424,7 @@ static VALUE rxml_parser_context_errno_get(VALUE self)
 static VALUE rxml_parser_context_html_q(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   if (ctxt->html == 1)
     return (Qtrue);
@@ -436,7 +443,7 @@ static VALUE rxml_parser_context_io_max_num_streams_get(VALUE self)
 {
   // TODO alias to max_streams and dep this?
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   return (INT2NUM(ctxt->inputMax));
 }
@@ -451,7 +458,7 @@ static VALUE rxml_parser_context_io_max_num_streams_get(VALUE self)
 static VALUE rxml_parser_context_io_num_streams_get(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   return (INT2NUM(ctxt->inputNr));
 }
@@ -466,7 +473,7 @@ static VALUE rxml_parser_context_io_num_streams_get(VALUE self)
 static VALUE rxml_parser_context_keep_blanks_q(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   if (ctxt->keepBlanks)
     return (Qtrue);
@@ -483,7 +490,7 @@ static VALUE rxml_parser_context_keep_blanks_q(VALUE self)
 static VALUE rxml_parser_context_name_depth_get(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   return (INT2NUM(ctxt->nameNr));
 }
@@ -497,7 +504,7 @@ static VALUE rxml_parser_context_name_depth_get(VALUE self)
 static VALUE rxml_parser_context_name_depth_max_get(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   return (INT2NUM(ctxt->nameMax));
 }
@@ -511,7 +518,7 @@ static VALUE rxml_parser_context_name_depth_max_get(VALUE self)
 static VALUE rxml_parser_context_name_node_get(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   if (ctxt->name == NULL)
     return (Qnil);
@@ -531,7 +538,7 @@ static VALUE rxml_parser_context_name_tab_get(VALUE self)
   xmlParserCtxtPtr ctxt;
   VALUE tab_ary;
 
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   if (ctxt->nameTab == NULL)
     return (Qnil);
@@ -558,7 +565,7 @@ static VALUE rxml_parser_context_name_tab_get(VALUE self)
 static VALUE rxml_parser_context_node_depth_get(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   return (INT2NUM(ctxt->nodeNr));
 }
@@ -572,7 +579,7 @@ static VALUE rxml_parser_context_node_depth_get(VALUE self)
 static VALUE rxml_parser_context_node_get(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   if (ctxt->node == NULL)
     return (Qnil);
@@ -589,7 +596,7 @@ static VALUE rxml_parser_context_node_get(VALUE self)
 static VALUE rxml_parser_context_node_depth_max_get(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   return (INT2NUM(ctxt->nodeMax));
 }
@@ -603,7 +610,7 @@ static VALUE rxml_parser_context_node_depth_max_get(VALUE self)
 static VALUE rxml_parser_context_num_chars_get(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   return (LONG2NUM(ctxt->nbChars));
 }
@@ -619,7 +626,7 @@ static VALUE rxml_parser_context_num_chars_get(VALUE self)
 static VALUE rxml_parser_context_options_get(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   return INT2NUM(ctxt->options);
 }
@@ -638,7 +645,7 @@ static VALUE rxml_parser_context_options_set(VALUE self, VALUE options)
   xmlParserCtxtPtr ctxt;
   Check_Type(options, T_FIXNUM);
 
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
   xmlCtxtUseOptions(ctxt, NUM2INT(options));
 
   return self;
@@ -654,7 +661,7 @@ static VALUE rxml_parser_context_options_set(VALUE self, VALUE options)
 static VALUE rxml_parser_context_recovery_q(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   if (ctxt->recovery)
     return (Qtrue);
@@ -672,7 +679,7 @@ static VALUE rxml_parser_context_recovery_q(VALUE self)
 static VALUE rxml_parser_context_recovery_set(VALUE self, VALUE value)
 {
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   if (value == Qfalse)
   {
@@ -696,7 +703,7 @@ static VALUE rxml_parser_context_recovery_set(VALUE self, VALUE value)
 static VALUE rxml_parser_context_replace_entities_q(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   if (ctxt->replaceEntities)
     return (Qtrue);
@@ -714,7 +721,7 @@ static VALUE rxml_parser_context_replace_entities_q(VALUE self)
 static VALUE rxml_parser_context_replace_entities_set(VALUE self, VALUE value)
 {
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   if (value == Qfalse)
   {
@@ -737,7 +744,7 @@ static VALUE rxml_parser_context_replace_entities_set(VALUE self, VALUE value)
 static VALUE rxml_parser_context_space_depth_get(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   return (INT2NUM(ctxt->spaceNr));
 }
@@ -751,7 +758,7 @@ static VALUE rxml_parser_context_space_depth_get(VALUE self)
 static VALUE rxml_parser_context_space_depth_max_get(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   return (INT2NUM(ctxt->spaceMax));
 }
@@ -766,7 +773,7 @@ static VALUE rxml_parser_context_space_depth_max_get(VALUE self)
 static VALUE rxml_parser_context_subset_external_q(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   if (ctxt->inSubset == 2)
     return (Qtrue);
@@ -784,7 +791,7 @@ static VALUE rxml_parser_context_subset_external_q(VALUE self)
 static VALUE rxml_parser_context_subset_internal_q(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   if (ctxt->inSubset == 1)
     return (Qtrue);
@@ -803,7 +810,7 @@ static VALUE rxml_parser_context_subset_internal_q(VALUE self)
 static VALUE rxml_parser_context_subset_name_get(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   if (ctxt->intSubName == NULL)
     return (Qnil);
@@ -822,7 +829,7 @@ static VALUE rxml_parser_context_subset_name_get(VALUE self)
 static VALUE rxml_parser_context_subset_external_uri_get(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   if (ctxt->extSubURI == NULL)
     return (Qnil);
@@ -841,7 +848,7 @@ static VALUE rxml_parser_context_subset_external_uri_get(VALUE self)
 static VALUE rxml_parser_context_subset_external_system_id_get(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   if (ctxt->extSubSystem == NULL)
     return (Qnil);
@@ -858,7 +865,7 @@ static VALUE rxml_parser_context_subset_external_system_id_get(VALUE self)
 static VALUE rxml_parser_context_standalone_q(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   if (ctxt->standalone)
     return (Qtrue);
@@ -875,7 +882,7 @@ static VALUE rxml_parser_context_standalone_q(VALUE self)
 static VALUE rxml_parser_context_stats_q(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   if (ctxt->record_info)
     return (Qtrue);
@@ -892,7 +899,7 @@ static VALUE rxml_parser_context_stats_q(VALUE self)
 static VALUE rxml_parser_context_valid_q(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   if (ctxt->valid)
     return (Qtrue);
@@ -909,7 +916,7 @@ static VALUE rxml_parser_context_valid_q(VALUE self)
 static VALUE rxml_parser_context_validate_q(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   if (ctxt->validate)
     return (Qtrue);
@@ -926,7 +933,7 @@ static VALUE rxml_parser_context_validate_q(VALUE self)
 static VALUE rxml_parser_context_version_get(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   if (ctxt->version == NULL)
     return (Qnil);
@@ -943,7 +950,7 @@ static VALUE rxml_parser_context_version_get(VALUE self)
 static VALUE rxml_parser_context_well_formed_q(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(self, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   if (ctxt->wellFormed)
     return (Qtrue);

data/ext/libxml/ruby_xml_parser_context.h

@@ -4,6 +4,7 @@
 #define __RXML_PARSER_CONTEXT__
 
 extern VALUE cXMLParserContext;
+extern const rb_data_type_t rxml_parser_context_type;
 
 void rxml_init_parser_context(void);
 

data/ext/libxml/ruby_xml_reader.c

@@ -9,6 +9,7 @@
 #include <libxml/xmlreader.h>
 #include <libxml/xmlschemas.h>
 
+
 /*
  * Document-class: LibXML::XML::Reader
  *
@@ -59,28 +60,40 @@ static ID ENCODING_SYMBOL;
 static ID IO_ATTR;
 static ID OPTIONS_SYMBOL;
 
-static void rxml_reader_free(xmlTextReaderPtr xreader)
+static void rxml_reader_free(void* data)
 {
+  xmlTextReaderPtr xreader = (xmlTextReaderPtr)data;
   xmlFreeTextReader(xreader);
 }
 
-static void rxml_reader_mark(xmlTextReaderPtr xreader)
+static void rxml_reader_mark(void* data)
 {
+  xmlTextReaderPtr xreader = (xmlTextReaderPtr)data;
   xmlDocPtr xdoc = xmlTextReaderCurrentDoc(xreader);
-  VALUE doc = (VALUE)xdoc->_private;
-  rb_gc_mark(doc);
+  if (xdoc)
+  {
+    VALUE doc = rxml_registry_lookup(xdoc);
+    if (!NIL_P(doc))
+      rb_gc_mark(doc);
+  }
 }
 
+static const rb_data_type_t rxml_reader_data_type = {
+  .wrap_struct_name = "LibXML::XML::Reader",
+  .function = { .dmark = rxml_reader_mark, .dfree = rxml_reader_free },
+  .flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 static VALUE rxml_reader_wrap(xmlTextReaderPtr xreader)
 {
-  return Data_Wrap_Struct(cXMLReader, NULL, rxml_reader_free, xreader);
+  return TypedData_Wrap_Struct(cXMLReader, &rxml_reader_data_type, xreader);
 }
 
 
 static xmlTextReaderPtr rxml_text_reader_get(VALUE obj)
 {
   xmlTextReaderPtr xreader;
-  Data_Get_Struct(obj, xmlTextReader, xreader);
+  TypedData_Get_Struct(obj, xmlTextReader, &rxml_reader_data_type, xreader);
   return xreader;
 }
 
@@ -95,7 +108,7 @@ VALUE rxml_reader_document(VALUE klass, VALUE doc)
   xmlDocPtr xdoc;
   xmlTextReaderPtr xreader;
 
-  Data_Get_Struct(doc, xmlDoc, xdoc);
+  TypedData_Get_Struct(doc, xmlDoc, &rxml_document_data_type, xdoc);
 
   xreader = xmlReaderWalker(xdoc);
 
@@ -606,7 +619,7 @@ static VALUE rxml_reader_relax_ng_validate(VALUE self, VALUE rng)
   xmlTextReaderPtr xreader = rxml_text_reader_get(self);
   xmlRelaxNGPtr xrelax;
   int status;
-  Data_Get_Struct(rng, xmlRelaxNG, xrelax);
+  TypedData_Get_Struct(rng, xmlRelaxNG, &rxml_relaxng_data_type, xrelax);
   
   status = xmlTextReaderRelaxNGSetSchema(xreader, xrelax);
   return (status == 0 ? Qtrue : Qfalse);
@@ -631,7 +644,7 @@ rxml_reader_schema_validate(VALUE self, VALUE xsd)
   xmlSchemaPtr xschema;
   int status;
 
-  Data_Get_Struct(xsd, xmlSchema, xschema);
+  TypedData_Get_Struct(xsd, xmlSchema, &rxml_schema_type, xschema);
   status = xmlTextReaderSetSchema(xreader, xschema);
   return (status == 0 ? Qtrue : Qfalse);
 }
@@ -997,12 +1010,12 @@ static VALUE rxml_reader_expand(VALUE self)
   }
   else
   {
-	  /* We cannot call rxml_node_wrap here because its sets up a mark function
+	  /* We cannot call rxml_node_wrap here because it sets up a mark function
 	   for the node. But according to the libxml docs (http://xmlsoft.org/html/libxml-xmlreader.html#xmlTextReaderExpand)
 	   this is only valid until the next xmlTextReaderRead call.  At that point the node is freed (from reading
-	   the libxml2 source code.  So don't set a mark or free function, because they will get called in the next
+	   the libxml2 source code).  So don't set a mark or free function, because they will get called in the next
 	   garbage collection run and cause a segfault.*/
-	return Data_Wrap_Struct(cXMLNode, NULL, NULL, xnode);
+	return TypedData_Wrap_Struct(cXMLNode, &rxml_node_unmanaged_data_type, xnode);
   }
 }
 
@@ -1027,9 +1040,6 @@ static VALUE rxml_reader_doc(VALUE self)
 
   result = rxml_document_wrap(xdoc);
 
-  // And now hook in a mark function to keep the document alive as long as the reader is valid
-  RDATA(self)->dmark = (RUBY_DATA_FUNC)rxml_reader_mark;
-
   return result;
 }
 

data/ext/libxml/ruby_xml_registry.c

@@ -0,0 +1,31 @@
+/* Please see the LICENSE file for copyright and distribution information */
+
+#include "ruby_libxml.h"
+#include "ruby_xml_registry.h"
+
+#include <ruby/st.h>
+
+static st_table *rxml_registry;
+
+void rxml_init_registry(void)
+{
+  rxml_registry = st_init_numtable();
+}
+
+void rxml_registry_register(void *ptr, VALUE obj)
+{
+  st_insert(rxml_registry, (st_data_t)ptr, (st_data_t)obj);
+}
+
+void rxml_registry_unregister(void *ptr)
+{
+  st_delete(rxml_registry, (st_data_t *)&ptr, NULL);
+}
+
+VALUE rxml_registry_lookup(void *ptr)
+{
+  st_data_t val;
+  if (st_lookup(rxml_registry, (st_data_t)ptr, &val))
+    return (VALUE)val;
+  return Qnil;
+}

data/ext/libxml/ruby_xml_registry.h

@@ -0,0 +1,22 @@
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RXML_REGISTRY__
+#define __RXML_REGISTRY__
+
+/* Pointer-to-VALUE registry for mapping C structs (xmlDocPtr, xmlNodePtr,
+   etc.) back to their Ruby wrappers.
+
+   The registry is a global st_table keyed by C pointer address.  It is NOT a
+   GC root -- entries do not prevent garbage collection.  Objects stay alive
+   through the normal mark chains (mark functions look up the registry instead
+   of reading _private).
+
+   Registered pointers MUST be unregistered before the underlying C struct is
+   freed, typically in the wrapper's dfree function. */
+
+void  rxml_init_registry(void);
+void  rxml_registry_register(void *ptr, VALUE obj);
+void  rxml_registry_unregister(void *ptr);
+VALUE rxml_registry_lookup(void *ptr);   /* Qnil on miss */
+
+#endif

data/ext/libxml/ruby_xml_relaxng.c

@@ -34,11 +34,18 @@
 
 VALUE cXMLRelaxNG;
 
-static void rxml_relaxng_free(xmlRelaxNGPtr xrelaxng)
+static void rxml_relaxng_free(void* data)
 {
+  xmlRelaxNGPtr xrelaxng = (xmlRelaxNGPtr)data;
   xmlRelaxNGFree(xrelaxng);
 }
 
+const rb_data_type_t rxml_relaxng_data_type = {
+  .wrap_struct_name = "LibXML::XML::RelaxNG",
+  .function = { .dmark = NULL, .dfree = rxml_relaxng_free },
+  .flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 /*
  * call-seq:
  *    XML::Relaxng.new(relaxng_uri) -> relaxng
@@ -56,7 +63,10 @@ static VALUE rxml_relaxng_init_from_uri(VALUE class, VALUE uri)
   xrelaxng = xmlRelaxNGParse(xparser);
   xmlRelaxNGFreeParserCtxt(xparser);
 
-  return Data_Wrap_Struct(cXMLRelaxNG, NULL, rxml_relaxng_free, xrelaxng);
+  if (!xrelaxng)
+    rxml_raise(xmlGetLastError());
+
+  return TypedData_Wrap_Struct(cXMLRelaxNG, &rxml_relaxng_data_type, xrelaxng);
 }
 
 /*
@@ -71,13 +81,16 @@ static VALUE rxml_relaxng_init_from_document(VALUE class, VALUE document)
   xmlRelaxNGPtr xrelaxng;
   xmlRelaxNGParserCtxtPtr xparser;
 
-  Data_Get_Struct(document, xmlDoc, xdoc);
+  TypedData_Get_Struct(document, xmlDoc, &rxml_document_data_type, xdoc);
 
   xparser = xmlRelaxNGNewDocParserCtxt(xdoc);
   xrelaxng = xmlRelaxNGParse(xparser);
   xmlRelaxNGFreeParserCtxt(xparser);
 
-  return Data_Wrap_Struct(cXMLRelaxNG, NULL, rxml_relaxng_free, xrelaxng);
+  if (!xrelaxng)
+    rxml_raise(xmlGetLastError());
+
+  return TypedData_Wrap_Struct(cXMLRelaxNG, &rxml_relaxng_data_type, xrelaxng);
 }
 
 /*
@@ -97,7 +110,10 @@ static VALUE rxml_relaxng_init_from_string(VALUE self, VALUE relaxng_str)
   xrelaxng = xmlRelaxNGParse(xparser);
   xmlRelaxNGFreeParserCtxt(xparser);
 
-  return Data_Wrap_Struct(cXMLRelaxNG, NULL, rxml_relaxng_free, xrelaxng);
+  if (!xrelaxng)
+    rxml_raise(xmlGetLastError());
+
+  return TypedData_Wrap_Struct(cXMLRelaxNG, &rxml_relaxng_data_type, xrelaxng);
 }
 
 void rxml_init_relaxng(void)

data/ext/libxml/ruby_xml_relaxng.h

@@ -2,6 +2,7 @@
 #define __RXML_RELAXNG__
 
 extern VALUE cXMLRelaxNG;
+extern const rb_data_type_t rxml_relaxng_data_type;
 
 void  rxml_init_relaxng(void);
 #endif

data/ext/libxml/ruby_xml_sax_parser.c

@@ -76,7 +76,7 @@ static VALUE rxml_sax_parser_parse(VALUE self)
 {
   VALUE context = rb_ivar_get(self, CONTEXT_ATTR);
   xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(context, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(context, xmlParserCtxt, &rxml_parser_context_type, ctxt);
 
   ctxt->sax2 = 1;
 	ctxt->userData = (void*)rb_ivar_get(self, CALLBACKS_ATTR);