@@ -296,12 +296,15 @@ VALUE Nokogiri_wrap_xml_document(VALUE klass, xmlDocPtr doc) dealloc, doc ); + + VALUE cache = rb_ary_new(); rb_iv_set(rb_doc, "@decorators", Qnil); - rb_iv_set(rb_doc, "@node_cache", rb_ary_new()); + rb_iv_set(rb_doc, "@node_cache", cache); rb_funcall(rb_doc, rb_intern("initialize"), 0); tuple->doc = (void *)rb_doc; tuple->unlinkedNodes = xmlXPathNodeSetCreate(NULL); + tuple->node_cache = cache; doc->_private = tuple ; return rb_doc ; ext/nokogiri/xml_document.c @@ -6,6 +6,7 @@ struct _nokogiriTuple { xmlDocPtr doc; xmlNodeSetPtr unlinkedNodes; + VALUE node_cache; }; typedef struct _nokogiriTuple nokogiriTuple; typedef nokogiriTuple * nokogiriTuplePtr; @@ -16,6 +17,7 @@ VALUE Nokogiri_wrap_xml_document(VALUE klass, xmlDocPtr doc); #define DOC_RUBY_OBJECT_TEST(x) ((nokogiriTuplePtr)(x->_private)) #define DOC_RUBY_OBJECT(x) ((VALUE)((nokogiriTuplePtr)(x->_private))->doc) #define DOC_UNLINKED_NODE_SET(x) ((xmlNodeSetPtr)((nokogiriTuplePtr)(x->_private))->unlinkedNodes) +#define DOC_NODE_CACHE(x) ((VALUE)((nokogiriTuplePtr)(x->_private))->node_cache) extern VALUE cNokogiriXmlDocument ; #endif ext/nokogiri/xml_document.h @@ -857,7 +857,7 @@ VALUE Nokogiri_wrap_xml_node(VALUE klass, xmlNodePtr node) if (DOC_RUBY_OBJECT_TEST(node->doc) && DOC_RUBY_OBJECT(node->doc)) { document = DOC_RUBY_OBJECT(node->doc); - node_cache = rb_iv_get(document, "@node_cache"); + node_cache = DOC_NODE_CACHE(node->doc); } rb_ary_push(node_cache, rb_node); ext/nokogiri/xml_node.c 926b881c7f20d5f17c80c451451151501656609f Aaron Patterson aaron.patterson@gmail.com http://github.com/tenderlove/nokogiri/commit/b69649bf6ca39b7eea3476f7d9fa2828ec74ea5a b69649bf6ca39b7eea3476f7d9fa2828ec74ea5a 2009-06-21T20:48:15-07:00 2009-06-21T20:48:15-07:00 adding node cache to tuple 5599a1c47ffea70f2beb570ffeeb2201069e9d8f Aaron Patterson aaron.patterson@gmail.com