libxml-ruby 4.1.2 → 6.0.0

data/ext/libxml/ruby_xml_schema_facet.c

@@ -1,50 +1,50 @@
-#include "ruby_libxml.h"
-#include "ruby_xml_schema_facet.h"
-
-#include <libxml/schemasInternals.h>
-#include <libxml/xmlschemas.h>
-#include <libxml/xmlschemastypes.h>
-
-VALUE cXMLSchemaFacet;
-
-static void rxml_schema_facet_free(xmlSchemaFacetPtr xschema_type)
-{
-  xschema_type = NULL;
-  xmlFree(xschema_type);
-}
-
-VALUE rxml_wrap_schema_facet(xmlSchemaFacetPtr facet)
-{
-  VALUE result;
-
-  if (!facet)
-    rb_raise(rb_eArgError, "XML::Schema::Facet required!");
-
-  result = Data_Wrap_Struct(cXMLSchemaFacet, NULL, rxml_schema_facet_free, facet);
-
-  rb_iv_set(result, "@kind", INT2NUM(facet->type));
-  rb_iv_set(result, "@value", QNIL_OR_STRING(facet->value));
-
-  return result;
-
-}
-
-/* START FACET*/
-
-static VALUE rxml_schema_facet_node(VALUE self)
-{
-  xmlSchemaFacetPtr facet;
-
-  Data_Get_Struct(self, xmlSchemaFacet, facet);
-
-  return rxml_node_wrap(facet->node);
-}
-
-void rxml_init_schema_facet(void)
-{
-  cXMLSchemaFacet = rb_define_class_under(cXMLSchema, "Facet", rb_cObject);
-  rb_define_attr(cXMLSchemaFacet, "kind", 1, 0);
-  rb_define_attr(cXMLSchemaFacet, "value", 1, 0);
-
-  rb_define_method(cXMLSchemaFacet, "node", rxml_schema_facet_node, 0);
-}
+#include "ruby_libxml.h"
+#include "ruby_xml_schema_facet.h"
+
+#include <libxml/schemasInternals.h>
+#include <libxml/xmlschemas.h>
+#include <libxml/xmlschemastypes.h>
+
+VALUE cXMLSchemaFacet;
+
+static const rb_data_type_t rxml_schema_facet_type = {
+  "XML::Schema::Facet",
+  {NULL, NULL, NULL},
+  NULL, NULL, 0
+};
+
+VALUE rxml_wrap_schema_facet(xmlSchemaFacetPtr facet)
+{
+  VALUE result;
+
+  if (!facet)
+    rb_raise(rb_eArgError, "XML::Schema::Facet required!");
+
+  result = TypedData_Wrap_Struct(cXMLSchemaFacet, &rxml_schema_facet_type, facet);
+
+  rb_iv_set(result, "@kind", INT2NUM(facet->type));
+  rb_iv_set(result, "@value", QNIL_OR_STRING(facet->value));
+
+  return result;
+
+}
+
+/* START FACET*/
+
+static VALUE rxml_schema_facet_node(VALUE self)
+{
+  xmlSchemaFacetPtr facet;
+
+  TypedData_Get_Struct(self, xmlSchemaFacet, &rxml_schema_facet_type, facet);
+
+  return rxml_node_wrap(facet->node);
+}
+
+void rxml_init_schema_facet(void)
+{
+  cXMLSchemaFacet = rb_define_class_under(cXMLSchema, "Facet", rb_cObject);
+  rb_define_attr(cXMLSchemaFacet, "kind", 1, 0);
+  rb_define_attr(cXMLSchemaFacet, "value", 1, 0);
+
+  rb_define_method(cXMLSchemaFacet, "node", rxml_schema_facet_node, 0);
+}

data/ext/libxml/ruby_xml_schema_facet.h

@@ -1,9 +1,9 @@
-#ifndef __RXML_SCHEMA_FACET__
-#define __RXML_SCHEMA_FACET__
-
-extern VALUE cXMLSchemaFacet;
-
-VALUE rxml_wrap_schema_facet(xmlSchemaFacetPtr facet);
-void rxml_init_schema_facet(void);
-
-#endif
+#ifndef __RXML_SCHEMA_FACET__
+#define __RXML_SCHEMA_FACET__
+
+extern VALUE cXMLSchemaFacet;
+
+VALUE rxml_wrap_schema_facet(xmlSchemaFacetPtr facet);
+void rxml_init_schema_facet(void);
+
+#endif

data/ext/libxml/ruby_xml_schema_type.c

@@ -46,11 +46,11 @@ a group definition, a XML_SCHEMA_EXTRA_QNAMEREF (if a reference),
 
 VALUE cXMLSchemaType;
 
-static void rxml_schema_type_free(xmlSchemaTypePtr xschema_type)
-{
-  xschema_type = NULL;
-  xmlFree(xschema_type);
-}
+static const rb_data_type_t rxml_schema_type_type = {
+  "XML::Schema::Type",
+  {NULL, NULL, NULL},
+  NULL, NULL, 0
+};
 
 VALUE rxml_wrap_schema_type(xmlSchemaTypePtr xtype)
 {
@@ -59,7 +59,7 @@ VALUE rxml_wrap_schema_type(xmlSchemaTypePtr xtype)
   if (!xtype)
     rb_raise(rb_eArgError, "XML::Schema::Type required!");
 
-  result = Data_Wrap_Struct(cXMLSchemaType, NULL, rxml_schema_type_free, xtype);
+  result = TypedData_Wrap_Struct(cXMLSchemaType, &rxml_schema_type_type, xtype);
 
   rb_iv_set(result, "@name", QNIL_OR_STRING(xtype->name));
   rb_iv_set(result, "@namespace", QNIL_OR_STRING(xtype->targetNamespace));
@@ -72,7 +72,7 @@ static VALUE rxml_schema_type_base(VALUE self)
 {
   xmlSchemaTypePtr xtype;
 
-  Data_Get_Struct(self, xmlSchemaType, xtype);
+  TypedData_Get_Struct(self, xmlSchemaType, &rxml_schema_type_type, xtype);
 
   return (xtype->baseType != xtype) ? rxml_wrap_schema_type(xtype->baseType) : Qnil;
 }
@@ -81,7 +81,7 @@ static VALUE rxml_schema_type_node(VALUE self)
 {
   xmlSchemaTypePtr xtype;
 
-  Data_Get_Struct(self, xmlSchemaType, xtype);
+  TypedData_Get_Struct(self, xmlSchemaType, &rxml_schema_type_type, xtype);
 
   return (xtype->node != NULL) ? rxml_node_wrap(xtype->node) : Qnil;
 }
@@ -93,7 +93,7 @@ static VALUE rxml_schema_type_facets(VALUE self)
   VALUE result = rb_ary_new();
   VALUE facet;
 
-  Data_Get_Struct(self, xmlSchemaType, xtype);
+  TypedData_Get_Struct(self, xmlSchemaType, &rxml_schema_type_type, xtype);
 
   xfacet = xtype->facets;
 
@@ -112,7 +112,7 @@ static VALUE rxml_schema_type_annot(VALUE self)
   VALUE result = Qnil;
   xmlSchemaTypePtr xtype;
 
-  Data_Get_Struct(self, xmlSchemaType, xtype);
+  TypedData_Get_Struct(self, xmlSchemaType, &rxml_schema_type_type, xtype);
 
   if(xtype != NULL && xtype->annot != NULL && xtype->annot->content != NULL)
   {
@@ -198,7 +198,7 @@ static VALUE rxml_schema_type_elements(VALUE self)
   VALUE result = rb_hash_new();
   xmlSchemaTypePtr xtype;
 
-  Data_Get_Struct(self, xmlSchemaType, xtype);
+  TypedData_Get_Struct(self, xmlSchemaType, &rxml_schema_type_type, xtype);
   rxmlSchemaCollectElements((xmlSchemaParticlePtr) xtype->subtypes, result);
 
   return result;
@@ -212,7 +212,7 @@ static VALUE rxml_schema_type_attributes(VALUE self)
   xmlSchemaItemListPtr xuses;
   int i;
 
-  Data_Get_Struct(self, xmlSchemaType, xtype);
+  TypedData_Get_Struct(self, xmlSchemaType, &rxml_schema_type_type, xtype);
   xuses = xtype->attrUses;
 
   if (xuses != NULL)
@@ -229,13 +229,6 @@ static VALUE rxml_schema_type_attributes(VALUE self)
 
 void rxml_init_schema_type(void)
 {
-  /* Add in infinity support for ruby 1.8.7 */
-  #if !defined(RUBY_VM) && defined(INFINITY)
-  ID infinityId = rb_intern("INFINITY");
-  if (rb_const_defined(rb_cFloat, infinityId) == Qfalse)
-    rb_define_const(rb_cFloat, "INFINITY", rb_float_new(INFINITY));
-  #endif
-
   cXMLSchemaType = rb_define_class_under(cXMLSchema, "Type", rb_cObject);
   rb_undef_alloc_func(cXMLSchemaType);
 

data/ext/libxml/ruby_xml_schema_type.h

@@ -1,9 +1,9 @@
-#ifndef __RXML_SCHEMA_TYPE__
-#define __RXML_SCHEMA_TYPE__
-
-extern VALUE cXMLSchemaType;
-
-VALUE rxml_wrap_schema_type(xmlSchemaTypePtr xtype);
-void rxml_init_schema_type(void);
-
-#endif
+#ifndef __RXML_SCHEMA_TYPE__
+#define __RXML_SCHEMA_TYPE__
+
+extern VALUE cXMLSchemaType;
+
+VALUE rxml_wrap_schema_type(xmlSchemaTypePtr xtype);
+void rxml_init_schema_type(void);
+
+#endif

data/ext/libxml/ruby_xml_version.h

@@ -1,9 +1,9 @@
-/* Don't nuke this block!  It is used for automatically updating the
- * versions below. VERSION = string formatting, VERNUM = numbered
- * version for inline testing: increment both or none at all.*/
-#define RUBY_LIBXML_VERSION  "4.1.2"
-#define RUBY_LIBXML_VERNUM   400
-#define RUBY_LIBXML_VER_MAJ   4
-#define RUBY_LIBXML_VER_MIN   1
-#define RUBY_LIBXML_VER_MIC   2
-#define RUBY_LIBXML_VER_PATCH 0
+/* Don't nuke this block!  It is used for automatically updating the
+ * versions below. VERSION = string formatting, VERNUM = numbered
+ * version for inline testing: increment both or none at all.*/
+#define RUBY_LIBXML_VERSION  "6.0.0"
+#define RUBY_LIBXML_VERNUM   600
+#define RUBY_LIBXML_VER_MAJ   6
+#define RUBY_LIBXML_VER_MIN   0
+#define RUBY_LIBXML_VER_MIC   0
+#define RUBY_LIBXML_VER_PATCH 0