libxml-ruby 0.5.1.0 → 0.5.2.0

data/ext/xml/ruby_xml_node.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_node.h 138 2007-08-29 18:00:35Z danj $ */
+/* $Id: ruby_xml_node.h 189 2007-09-26 15:04:47Z danj $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -18,6 +18,7 @@ VALUE
 ruby_xml_node2_wrap(VALUE class, xmlNodePtr xnode);
 
 void ruby_xml_node_free(ruby_xml_node *rxn);
+void ruby_xml_node_mark_common(xmlNodePtr n);
 void ruby_init_xml_node(void);
 VALUE ruby_xml_node_child_set(VALUE self, VALUE obj);
 VALUE ruby_xml_node_name_get(VALUE self);

data/ext/xml/ruby_xml_node_set.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_node_set.c 138 2007-08-29 18:00:35Z danj $ */
+/* $Id: ruby_xml_node_set.c 192 2007-10-05 15:13:17Z danj $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -23,21 +23,15 @@ VALUE cXMLNodeSet;
  */
 VALUE
 ruby_xml_node_set_to_a(VALUE self) {
-  int i;
   ruby_xml_node_set *rxnset;
-  VALUE nodeobj, set_ary;
+  VALUE r;
 
   Data_Get_Struct(self, ruby_xml_node_set, rxnset);
-
-  set_ary = rb_ary_new();
-  if (!((rxnset->node_set == NULL) || (rxnset->node_set->nodeNr == 0))) {
-    for (i = 0; i < rxnset->node_set->nodeNr; i++) {
-      nodeobj = ruby_xml_node2_wrap(cXMLNode, rxnset->node_set->nodeTab[i]);
-      rb_ary_push(set_ary, nodeobj);
-    }
-  }
-  
-  return(set_ary);
+  r=ruby_xml_xpath_object_to_a(rxnset->rxpop);
+#ifdef NODE_DEBUG
+  fprintf(stderr,"node_set_to_a %s\n",rb_str2cstr(rb_ary_to_s(r),0));
+#endif
+  return r;
 }
 
 
@@ -49,27 +43,10 @@ ruby_xml_node_set_to_a(VALUE self) {
  */
 VALUE
 ruby_xml_node_set_each(VALUE self) {
-  int i;
   ruby_xml_node_set *rxnset;
-  VALUE nodeobj;
 
   Data_Get_Struct(self, ruby_xml_node_set, rxnset);
-
-  if (rxnset->node_set == NULL)
-    return(Qnil);
-
-  for (i = 0; i < rxnset->node_set->nodeNr; i++) {
-    switch(rxnset->node_set->nodeTab[i]->type) {
-    case XML_ATTRIBUTE_NODE:
-      nodeobj = ruby_xml_attr_wrap(cXMLAttr, (xmlAttrPtr)rxnset->node_set->nodeTab[i]);
-      break;
-    default:
-      nodeobj = ruby_xml_node2_wrap(cXMLNode, rxnset->node_set->nodeTab[i]);
-    }
-
-    rb_yield(nodeobj);
-  }
-  return(self);
+  return ruby_xml_xpath_object_each(rxnset->rxpop);
 }
 
 
@@ -82,8 +59,9 @@ ruby_xml_node_set_each(VALUE self) {
 VALUE
 ruby_xml_node_set_empty_q(VALUE self) {
   ruby_xml_node_set *rxnset;
-    Data_Get_Struct(self, ruby_xml_node_set, rxnset);
-  return ( rxnset->node_set == NULL || rxnset->node_set->nodeNr <= 0 ) ? Qtrue : Qfalse;
+
+  Data_Get_Struct(self, ruby_xml_node_set, rxnset);
+  return ruby_xml_xpath_object_empty_q(rxnset->rxpop);
 }
 
 
@@ -95,50 +73,12 @@ ruby_xml_node_set_empty_q(VALUE self) {
  */
 VALUE
 ruby_xml_node_set_first(VALUE self) {
-  ruby_xml_node_set *rxnset; 
-  VALUE nodeobj;
+  ruby_xml_node_set *rxnset;
 
   Data_Get_Struct(self, ruby_xml_node_set, rxnset);
-  
-  if (rxnset->node_set == NULL || rxnset->node_set->nodeNr < 1)
-    return(Qnil);
-    
-  switch(rxnset->node_set->nodeTab[0]->type) {
-    case XML_ATTRIBUTE_NODE:
-      nodeobj = ruby_xml_attr_wrap(cXMLAttr, (xmlAttrPtr)rxnset->node_set->nodeTab[0]);
-      break;
-    default:
-      nodeobj = ruby_xml_node2_wrap(cXMLNode, rxnset->node_set->nodeTab[0]);
-  }
-
-  return(nodeobj);
+  return ruby_xml_xpath_object_first(rxnset->rxpop);
 }
 
-
-void
-ruby_xml_node_set_free(ruby_xml_node_set *rxnset) {
-  void *data;
-
-  switch(rxnset->data_type) {
-  case RUBY_LIBXML_SRC_TYPE_NULL:
-    break;
-  case RUBY_LIBXML_SRC_TYPE_XPATH:
-    data = (void*)(rx_xpath_data *)rxnset->data;
-    free((rx_xpath_data *)data);
-  default:
-    rb_fatal("Unknown data type, %d", rxnset->data_type);
-  }
-
-  /* Don't need to free the node set because the nodeset is a child of
-     the XPath object that created the set.
-    if (rxnset->node_set != NULL)
-      xmlXPathFreeNodeSet(rxnset->node_set);
-  */
-
-  free(rxnset);
-}
-
-
 /*
  * call-seq:
  *    nodeset.length => num
@@ -148,45 +88,40 @@ ruby_xml_node_set_free(ruby_xml_node_set *rxnset) {
 VALUE
 ruby_xml_node_set_length(VALUE self) {
   ruby_xml_node_set *rxnset;
+
   Data_Get_Struct(self, ruby_xml_node_set, rxnset);
-  if (rxnset->node_set == NULL)
-    return(INT2FIX(0));
-  else
-    return(INT2NUM(rxnset->node_set->nodeNr));
+  return ruby_xml_xpath_object_length(rxnset->rxpop);
 }
 
 
 static void
 ruby_xml_node_set_mark(ruby_xml_node_set *rxnset) {
-  if (rxnset == NULL) return;
-  if (!NIL_P(rxnset->xd)) rb_gc_mark(rxnset->xd);
-  if (!NIL_P(rxnset->xpath)) rb_gc_mark(rxnset->xpath);
+  if (!NIL_P(rxnset->rxpop)) rb_gc_mark(rxnset->rxpop);
 }
 
+static void
+ruby_xml_node_set_free(ruby_xml_node_set *rxnset) {
+  free(rxnset);
+}
 
 VALUE
-ruby_xml_node_set_new(VALUE class, VALUE xd, VALUE xpath,
-			    xmlNodeSetPtr node_set) {
+ruby_xml_node_set_new(VALUE class, VALUE rxpop)
+{
   ruby_xml_node_set *rxnset;
-
   rxnset = ALLOC(ruby_xml_node_set);
-  rxnset->node_set = node_set;
-  rxnset->data = NULL;
-  rxnset->data_type = RUBY_LIBXML_SRC_TYPE_NULL;
-  rxnset->xd = xd;
-  rxnset->xpath = xpath;
-  return(Data_Wrap_Struct(class, ruby_xml_node_set_mark,
-			  ruby_xml_node_set_free, rxnset));
+  rxnset->rxpop=rxpop;
+  return Data_Wrap_Struct(class,
+			  ruby_xml_node_set_mark,
+			  ruby_xml_node_set_free,
+			  rxnset);
 }
 
-
 VALUE
-ruby_xml_node_set_new2(VALUE xd, VALUE xpath,
-			     xmlNodeSetPtr node_set) {
-  return(ruby_xml_node_set_new(cXMLNodeSet, xd, xpath, node_set));
+ruby_xml_node_set_new2(VALUE rxpop)
+{
+  return ruby_xml_node_set_new(cXMLNodeSet,rxpop);
 }
 
-
 /*
  * call-seq:
  *    nodeset.xpath => xpath
@@ -195,13 +130,7 @@ ruby_xml_node_set_new2(VALUE xd, VALUE xpath,
  */
 VALUE
 ruby_xml_node_set_xpath_get(VALUE self) {
-  ruby_xml_node_set *rxnset;
-
-  Data_Get_Struct(self, ruby_xml_node_set, rxnset);
-  if (NIL_P(rxnset->xpath))
-    return(Qnil);
-  else
-    return(rxnset->xpath);
+  rb_raise(rb_eRuntimeError,"xpath retrival is no longer supported");
 }
 
 
@@ -214,15 +143,7 @@ ruby_xml_node_set_xpath_get(VALUE self) {
  */
 VALUE
 ruby_xml_node_set_xpath_data_get(VALUE self) {
-  ruby_xml_node_set *rxnset;
-  rx_xpath_data *rxxpd;
-
-  Data_Get_Struct(self, ruby_xml_node_set, rxnset);
-  if (rxnset->data_type != RUBY_LIBXML_SRC_TYPE_XPATH)
-    return(Qnil);
-
-  rxxpd = (rx_xpath_data *)rxnset->data;
-  return(rxxpd->ctxt);
+  rb_raise(rb_eRuntimeError,"xpath data retrival is no longer supported");
 }
 
 // Rdoc needs to know 

data/ext/xml/ruby_xml_node_set.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_node_set.h 39 2006-02-21 20:40:16Z roscopeco $ */
+/* $Id: ruby_xml_node_set.h 183 2007-09-21 14:09:52Z danj $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -8,19 +8,13 @@
 extern VALUE cXMLNodeSet;
 
 typedef struct ruby_xml_node_set {
-  xmlNodeSetPtr node_set;
-  VALUE xd;
-  VALUE xpath;
-  int data_type;
-  void *data;
+  VALUE rxpop;
 } ruby_xml_node_set;
 
-void ruby_xml_node_set_free(ruby_xml_node_set *rxnset);
 void ruby_init_xml_node_set(void);
-VALUE ruby_xml_node_set_new(VALUE class, VALUE xd, VALUE xpath,
-			    xmlNodeSetPtr node_set);
-VALUE ruby_xml_node_set_new2(VALUE xd, VALUE xpath,
-			     xmlNodeSetPtr node_set);
+VALUE ruby_xml_node_set_new(VALUE class, VALUE xpop);
+VALUE ruby_xml_node_set_new2(VALUE xpop);
 VALUE ruby_xml_node_set_each(VALUE self);
+VALUE ruby_xml_node_set_first(VALUE self);
 
 #endif

data/ext/xml/ruby_xml_ns.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_ns.c 39 2006-02-21 20:40:16Z roscopeco $ */
+/* $Id: ruby_xml_ns.c 134 2007-08-29 17:30:19Z danj $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/xml/ruby_xml_ns.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_ns.h 39 2006-02-21 20:40:16Z roscopeco $ */
+/* $Id: ruby_xml_ns.h 134 2007-08-29 17:30:19Z danj $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/xml/ruby_xml_parser.c

@@ -1,5 +1,4 @@
-/* $Id: ruby_xml_parser.c 138 2007-08-29 18:00:35Z danj $ */
-/* $Id: ruby_xml_parser.c 138 2007-08-29 18:00:35Z danj $ */
+/* $Id: ruby_xml_parser.c 192 2007-10-05 15:13:17Z danj $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -9,7 +8,6 @@
 static VALUE libxml_xmlRubyErrorProc = Qnil;
 static int id_call;
 
-int ruby_xml_parser_count = 0;
 VALUE cXMLParser;
 VALUE eXMLParserParseError;
 
@@ -798,10 +796,6 @@ void
 ruby_xml_parser_free(ruby_xml_parser *rxp) {
   void *data;
 
-  ruby_xml_parser_count--;
-  if (ruby_xml_parser_count == 0)
-    xmlCleanupParser();
-
   switch(rxp->data_type) {
   case RUBY_LIBXML_SRC_TYPE_NULL:
     break;
@@ -940,6 +934,8 @@ ruby_xml_parser_mark(ruby_xml_parser *rxp) {
   if (rxp == NULL) return;
   if (!NIL_P(rxp->ctxt)) rb_gc_mark(rxp->ctxt);
 
+  ruby_xml_state_marker();
+
   switch(rxp->data_type) {
   case RUBY_LIBXML_SRC_TYPE_NULL:
     break;
@@ -1007,16 +1003,20 @@ ruby_xml_parser_memory_used(VALUE self) {
 VALUE
 ruby_xml_parser_new(VALUE class) {
   ruby_xml_parser *rxp;
+  VALUE r;
+
+  r=Data_Make_Struct(class,
+		     ruby_xml_parser,
+		     ruby_xml_parser_mark,
+		     ruby_xml_parser_free,
+		     rxp);
 
-  ruby_xml_parser_count++;
-  rxp = ALLOC(ruby_xml_parser);
   rxp->ctxt = Qnil;
   rxp->data_type = RUBY_LIBXML_SRC_TYPE_NULL;
   rxp->data = NULL;
   rxp->parsed = 0;
 
-  return(Data_Wrap_Struct(class, ruby_xml_parser_mark,
-			  ruby_xml_parser_free, rxp));
+  return r;
 }
 
 

data/ext/xml/ruby_xml_parser.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_parser.h 39 2006-02-21 20:40:16Z roscopeco $ */
+/* $Id: ruby_xml_parser.h 134 2007-08-29 17:30:19Z danj $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/xml/ruby_xml_parser_context.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_parser_context.c 138 2007-08-29 18:00:35Z danj $ */
+/* $Id: ruby_xml_parser_context.c 189 2007-09-26 15:04:47Z danj $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -140,18 +140,19 @@ ruby_xml_parser_context_errno_get(VALUE self) {
 
 void
 ruby_xml_parser_context_free(ruby_xml_parser_context *rxpc) {
-  if (rxpc->ctxt != NULL && !rxpc->is_ptr) {
+  if (rxpc->ctxt != NULL) {
     xmlFreeParserCtxt(rxpc->ctxt);
-    ruby_xml_parser_count--;
     rxpc->ctxt = NULL;
   }
 
-  if (ruby_xml_parser_count == 0)
-    xmlCleanupParser();
-
   free(rxpc);
 }
 
+void
+ruby_xml_parser_context_mark(void *v) {
+  if ( v == NULL ) return;
+  ruby_xml_state_marker();
+}
 
 /*
  * call-seq:
@@ -370,11 +371,12 @@ ruby_xml_parser_context_new(VALUE class, xmlParserCtxtPtr ctxt) {
   ruby_xml_parser_context *rxpc;
 
   rxpc = ALLOC(ruby_xml_parser_context);
-  ruby_xml_parser_count++;
 
   rxpc->ctxt = ctxt;
-  rxpc->is_ptr = 0;
-  return(Data_Wrap_Struct(class, 0, ruby_xml_parser_context_free, rxpc));
+  return Data_Wrap_Struct(class,
+			  ruby_xml_parser_context_mark,
+			  ruby_xml_parser_context_free,
+			  rxpc);
 }
 
 

data/ext/xml/ruby_xml_parser_context.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_parser_context.h 39 2006-02-21 20:40:16Z roscopeco $ */
+/* $Id: ruby_xml_parser_context.h 134 2007-08-29 17:30:19Z danj $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/xml/ruby_xml_sax_parser.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_sax_parser.c 111 2006-11-20 01:39:14Z roscopeco $ */
+/* $Id: ruby_xml_sax_parser.c 134 2007-08-29 17:30:19Z danj $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/xml/ruby_xml_sax_parser.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_sax_parser.h 111 2006-11-20 01:39:14Z roscopeco $ */
+/* $Id: ruby_xml_sax_parser.h 134 2007-08-29 17:30:19Z danj $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/xml/ruby_xml_state.c

@@ -0,0 +1,114 @@
+/* $Id$ */
+
+#include "libxml.h"
+
+VALUE cXMLState;
+static VALUE weak_holder;
+static int id_inst;
+
+ID id_state;
+
+#undef DEBUG
+
+void
+ruby_xml_state_free(int * dummy) {
+  if ( dummy==NULL ) return;
+  xmlCleanupParser();
+  free(dummy);
+  dummy=NULL;
+  weak_holder=Qnil;
+  rb_ivar_set(cXMLState,id_state,Qnil);
+}
+
+void
+ruby_xml_state_mark(void * a) {
+#ifdef DEBUG
+  fprintf(stderr,"marked 0x%x\n",NUM2INT(rb_ivar_get(cXMLState,id_state)));
+#endif
+}
+
+VALUE
+ruby_xml_state_object() {
+  VALUE obj,id;
+  int *dummy;
+
+  id=rb_ivar_get(cXMLState,id_state);
+  if (NIL_P(id)) {
+    obj = Data_Make_Struct(cXMLState, int,
+			   ruby_xml_state_mark,
+			   ruby_xml_state_free,
+			   dummy);
+    rb_ivar_set(cXMLState,id_state,id=rb_obj_id(obj));
+    *dummy=0;
+    weak_holder=obj;
+    return obj;
+  }
+
+#ifdef DEBUG
+  fprintf(stderr,"getting 0x%x\n",NUM2INT(id));
+#endif
+  return weak_holder;
+
+  return rb_funcall(rb_const_get(rb_cModule,rb_intern("ObjectSpace")),
+		    rb_intern("_id2ref"),
+		    1,
+		    id);
+}
+
+VALUE
+ruby_xml_state_object_find_aux(VALUE id) {
+  rb_funcall(rb_const_get(rb_cModule,rb_intern("ObjectSpace")),
+	     rb_intern("_id2ref"),
+	     1,
+	     id);
+}
+
+
+static VALUE
+find_failed() {
+  return Qnil;
+}
+
+VALUE
+ruby_xml_state_object_find(VALUE id) {
+  return rb_rescue(ruby_xml_state_object_find_aux, id, find_failed, 0);
+}
+/*
+ * This will establish a use and mark it or mark an existing use.
+ * should be called by parser.mark and document.mark
+ */
+void
+ruby_xml_state_marker(void) {
+  ruby_xml_state_object();
+  rb_gc_mark(weak_holder);
+}
+
+VALUE
+ruby_xml_state_used_p(VALUE klass)
+{
+  return rb_ivar_get(cXMLState,id_state);
+}
+
+VALUE
+ruby_xml_state_use(VALUE klass)
+{
+  return ruby_xml_state_object();
+}
+
+// Rdoc needs to know 
+#ifdef RDOC_NEVER_DEFINED
+  mXML = rb_define_module("XML");
+#endif
+
+
+void
+ruby_init_state(void) {	
+  cXMLState = rb_define_class_under(mXML, "State", rb_cObject);
+
+  rb_define_singleton_method(cXMLState, "used?",
+			     ruby_xml_state_used_p, 0);
+  rb_define_singleton_method(cXMLState, "use",
+			     ruby_xml_state_use, 0);
+
+  rb_ivar_set(cXMLState, id_state=rb_intern("@stateid"), Qnil);
+}