nokogiri 1.5.0.beta.1 → 1.5.0.beta.2

data/ext/nokogiri/nokogiri.c

@@ -23,11 +23,6 @@ int vasprintf (char **strp, const char *fmt, va_list ap)
 }
 #endif
 
-int is_2_6_16(void)
-{
-  return (strcmp(xmlParserVersion, "20616") <= 0) ? 1 : 0 ;
-}
-
 void Init_nokogiri()
 {
   xmlMemSetup(

data/ext/nokogiri/nokogiri.h

@@ -35,8 +35,6 @@ int vasprintf (char **strp, const char *fmt, va_list ap);
 #include <st.h>
 #endif
 
-int is_2_6_16(void) ;
-
 #ifndef UNUSED
 # if defined(__GNUC__)
 #  define MAYBE_UNUSED(name) name __attribute__((unused))
@@ -77,6 +75,8 @@ int is_2_6_16(void) ;
 #define RBSTR_OR_QNIL(_str) \
   (_str ? NOKOGIRI_STR_NEW2(_str) : Qnil)
 
+#include <xml_libxml2_hacks.h>
+
 #include <xml_io.h>
 #include <xml_document.h>
 #include <html_entity_lookup.h>

data/ext/nokogiri/xml_document.c

@@ -46,6 +46,11 @@ static void recursively_remove_namespaces_from_node(xmlNodePtr node)
 
   for (child = node->children ; child ; child = child->next)
     recursively_remove_namespaces_from_node(child);
+
+  if (node->nsDef) {
+    xmlFreeNsList(node->nsDef);
+    node->nsDef = NULL;
+  }
 }
 
 /*

data/ext/nokogiri/xml_libxml2_hacks.c

@@ -0,0 +1,112 @@
+#ifndef HAVE_XMLFIRSTELEMENTCHILD
+#include <libxml/tree.h>
+/**
+ * xmlFirstElementChild:
+ * @parent: the parent node
+ *
+ * Finds the first child node of that element which is a Element node
+ * Note the handling of entities references is different than in
+ * the W3C DOM element traversal spec since we don't have back reference
+ * from entities content to entities references.
+ *
+ * Returns the first element child or NULL if not available
+ */
+xmlNodePtr
+xmlFirstElementChild(xmlNodePtr parent) {
+    xmlNodePtr cur = NULL;
+
+    if (parent == NULL)
+        return(NULL);
+    switch (parent->type) {
+        case XML_ELEMENT_NODE:
+        case XML_ENTITY_NODE:
+        case XML_DOCUMENT_NODE:
+        case XML_HTML_DOCUMENT_NODE:
+            cur = parent->children;
+            break;
+        default:
+            return(NULL);
+    }
+    while (cur != NULL) {
+        if (cur->type == XML_ELEMENT_NODE)
+            return(cur);
+        cur = cur->next;
+    }
+    return(NULL);
+}
+
+/**
+ * xmlNextElementSibling:
+ * @node: the current node
+ *
+ * Finds the first closest next sibling of the node which is an
+ * element node.
+ * Note the handling of entities references is different than in
+ * the W3C DOM element traversal spec since we don't have back reference
+ * from entities content to entities references.
+ *
+ * Returns the next element sibling or NULL if not available
+ */
+xmlNodePtr
+xmlNextElementSibling(xmlNodePtr node) {
+    if (node == NULL)
+        return(NULL);
+    switch (node->type) {
+        case XML_ELEMENT_NODE:
+        case XML_TEXT_NODE:
+        case XML_CDATA_SECTION_NODE:
+        case XML_ENTITY_REF_NODE:
+        case XML_ENTITY_NODE:
+        case XML_PI_NODE:
+        case XML_COMMENT_NODE:
+        case XML_DTD_NODE:
+        case XML_XINCLUDE_START:
+        case XML_XINCLUDE_END:
+            node = node->next;
+            break;
+        default:
+            return(NULL);
+    }
+    while (node != NULL) {
+        if (node->type == XML_ELEMENT_NODE)
+            return(node);
+        node = node->next;
+    }
+    return(NULL);
+}
+
+/**
+ * xmlLastElementChild:
+ * @parent: the parent node
+ *
+ * Finds the last child node of that element which is a Element node
+ * Note the handling of entities references is different than in
+ * the W3C DOM element traversal spec since we don't have back reference
+ * from entities content to entities references.
+ *
+ * Returns the last element child or NULL if not available
+ */
+xmlNodePtr
+xmlLastElementChild(xmlNodePtr parent) {
+    xmlNodePtr cur = NULL;
+
+    if (parent == NULL)
+        return(NULL);
+    switch (parent->type) {
+        case XML_ELEMENT_NODE:
+        case XML_ENTITY_NODE:
+        case XML_DOCUMENT_NODE:
+        case XML_HTML_DOCUMENT_NODE:
+            cur = parent->last;
+            break;
+        default:
+            return(NULL);
+    }
+    while (cur != NULL) {
+        if (cur->type == XML_ELEMENT_NODE)
+            return(cur);
+        cur = cur->prev;
+    }
+    return(NULL);
+}
+#endif

data/ext/nokogiri/xml_libxml2_hacks.h

@@ -0,0 +1,12 @@
+#ifndef HAVE_XMLFIRSTELEMENTCHILD
+
+#ifndef XML_LIBXML2_HACKS
+#define XML_LIBXML2_HACKS
+
+xmlNodePtr xmlFirstElementChild(xmlNodePtr parent);
+xmlNodePtr xmlNextElementSibling(xmlNodePtr node);
+xmlNodePtr xmlLastElementChild(xmlNodePtr parent);
+
+#endif
+
+#endif

data/ext/nokogiri/xml_node.c

@@ -103,7 +103,7 @@ static xmlNodePtr xmlReplaceNodeWrapper(xmlNodePtr pivot, xmlNodePtr new_node)
 static VALUE reparent_node_with(VALUE pivot_obj, VALUE reparentee_obj, pivot_reparentee_func prf)
 {
   VALUE reparented_obj ;
-  xmlNodePtr reparentee, pivot, reparented ;
+  xmlNodePtr reparentee, pivot, reparented, next_text, new_next_text ;
 
   if(!rb_obj_is_kind_of(reparentee_obj, cNokogiriXmlNode))
     rb_raise(rb_eArgError, "node must be a Nokogiri::XML::Node");
@@ -141,10 +141,32 @@ static VALUE reparent_node_with(VALUE pivot_obj, VALUE reparentee_obj, pivot_rep
     }
   }
 
-  /* TODO: I really want to remove this.  We shouldn't support 2.6.16 anymore */
-  if ( reparentee->type == XML_TEXT_NODE && pivot->type == XML_TEXT_NODE && is_2_6_16() ) {
-    /* work around a string-handling bug in libxml 2.6.16. we'd rather leak than segfault. */
-    pivot->content = xmlStrdup(pivot->content);
+  if (reparentee->type == XML_TEXT_NODE && pivot->next && pivot->next->type == XML_TEXT_NODE) {
+    /*
+     *  libxml merges text nodes in a right-to-left fashion, meaning that if
+     *  there are two text nodes who would be adjacent, the right (or following,
+     *  or next) node will be merged into the left (or preceding, or previous)
+     *  node.
+     *
+     *  and by "merged" I mean the string contents will be concatenated onto the
+     *  left node's contents, and then the node will be freed.
+     *
+     *  which means that if we have a ruby object wrapped around the right node,
+     *  its memory would be freed out from under it.
+     *
+     *  so, we detect this edge case and unlink-and-root the text node before it gets
+     *  merged. then we dup the node and insert that duplicate back into the
+     *  document where the real node was.
+     *
+     *  yes, this is totally lame.
+     */
+    next_text     = pivot->next ;
+    new_next_text = xmlDocCopyNode(next_text, pivot->doc, 1) ;
+
+    xmlUnlinkNode(next_text);
+    NOKOGIRI_ROOT_NODE(next_text);
+
+    xmlAddNextSibling(pivot, new_next_text);
   }
 
   if(!(reparented = (*prf)(pivot, reparentee))) {
@@ -1021,26 +1043,32 @@ static VALUE line(VALUE self)
  */
 static VALUE add_namespace_definition(VALUE self, VALUE prefix, VALUE href)
 {
-  xmlNodePtr node;
+  xmlNodePtr node, namespacee;
   xmlNsPtr ns;
 
   Data_Get_Struct(self, xmlNode, node);
+  namespacee = node ;
 
-  ns = xmlNewNs(
+  ns = xmlSearchNs(
+      node->doc,
       node,
-      (const xmlChar *)StringValuePtr(href),
       (const xmlChar *)(NIL_P(prefix) ? NULL : StringValuePtr(prefix))
   );
 
   if(!ns) {
-    ns = xmlSearchNs(
-        node->doc,
-        node,
+    if (node->type != XML_ELEMENT_NODE) {
+      namespacee = node->parent;
+    }
+    ns = xmlNewNs(
+        namespacee,
+        (const xmlChar *)StringValuePtr(href),
         (const xmlChar *)(NIL_P(prefix) ? NULL : StringValuePtr(prefix))
     );
   }
 
-  if(NIL_P(prefix)) xmlSetNs(node, ns);
+  if (!ns) return Qnil ;
+
+  if(NIL_P(prefix) || node != namespacee) xmlSetNs(node, ns);
 
   return Nokogiri_wrap_xml_namespace(node->doc, ns);
 }
@@ -1122,13 +1150,11 @@ static VALUE in_context(VALUE self, VALUE _str, VALUE _options)
   xmlNodePtr node;
   xmlNodePtr list;
   xmlNodeSetPtr set;
+  xmlParserErrors error;
   VALUE doc, err;
 
   Data_Get_Struct(self, xmlNode, node);
 
-  if(!node->parent)
-    rb_raise(rb_eRuntimeError, "no contextual parsing on unlinked nodes");
-
   doc = DOC_RUBY_OBJECT(node->doc);
   err = rb_iv_get(doc, "@errors");
 
@@ -1141,7 +1167,7 @@ static VALUE in_context(VALUE self, VALUE _str, VALUE _options)
   htmlHandleOmittedElem(0);
 #endif
 
-  xmlParseInNodeContext(
+  error = xmlParseInNodeContext(
       node,
       StringValuePtr(_str),
       (int)RSTRING_LEN(_str),
@@ -1154,6 +1180,20 @@ static VALUE in_context(VALUE self, VALUE _str, VALUE _options)
 
   xmlSetStructuredErrorFunc(NULL, NULL);
 
+  /* FIXME: This probably needs to handle more constants... */
+  switch(error) {
+    case XML_ERR_OK:
+      break;
+
+    case XML_ERR_INTERNAL_ERROR:
+    case XML_ERR_NO_MEMORY:
+      rb_raise(rb_eRuntimeError, "error parsing fragment (%d)", error);
+      break;
+
+    default:
+      break;
+  }
+
   set = xmlXPathNodeSetCreate(NULL);
 
   while(list) {

data/ext/nokogiri/xml_node_set.c

@@ -49,8 +49,8 @@ static VALUE push(VALUE self, VALUE rb_node)
   xmlNodeSetPtr node_set;
   xmlNodePtr node;
 
-  if(!rb_obj_is_kind_of(rb_node, cNokogiriXmlNode))
-    rb_raise(rb_eArgError, "node must be a Nokogiri::XML::Node");
+  if(!(rb_obj_is_kind_of(rb_node, cNokogiriXmlNode) || rb_obj_is_kind_of(rb_node, cNokogiriXmlNamespace)))
+    rb_raise(rb_eArgError, "node must be a Nokogiri::XML::Node or Nokogiri::XML::Namespace");
 
   Data_Get_Struct(self, xmlNodeSet, node_set);
   Data_Get_Struct(rb_node, xmlNode, node);
@@ -70,9 +70,9 @@ static VALUE delete(VALUE self, VALUE rb_node)
   xmlNodeSetPtr node_set ;
   xmlNodePtr node ;
 
-  if(!rb_obj_is_kind_of(rb_node, cNokogiriXmlNode))
-    rb_raise(rb_eArgError, "node must be a Nokogiri::XML::Node");
-  
+  if(!(rb_obj_is_kind_of(rb_node, cNokogiriXmlNode) || rb_obj_is_kind_of(rb_node, cNokogiriXmlNamespace)))
+    rb_raise(rb_eArgError, "node must be a Nokogiri::XML::Node or Nokogiri::XML::Namespace");
+
   Data_Get_Struct(self, xmlNodeSet, node_set);
   Data_Get_Struct(rb_node, xmlNode, node);
 
@@ -117,8 +117,8 @@ static VALUE include_eh(VALUE self, VALUE rb_node)
   xmlNodeSetPtr node_set;
   xmlNodePtr node;
 
-  if(!rb_obj_is_kind_of(rb_node, cNokogiriXmlNode))
-    rb_raise(rb_eArgError, "node must be a Nokogiri::XML::Node");
+  if(!(rb_obj_is_kind_of(rb_node, cNokogiriXmlNode) || rb_obj_is_kind_of(rb_node, cNokogiriXmlNamespace)))
+    rb_raise(rb_eArgError, "node must be a Nokogiri::XML::Node or Nokogiri::XML::Namespace");
 
   Data_Get_Struct(self, xmlNodeSet, node_set);
   Data_Get_Struct(rb_node, xmlNode, node);

data/ext/nokogiri/xml_reader.c

@@ -523,7 +523,7 @@ static VALUE outer_xml(VALUE self)
   Data_Get_Struct(self, xmlTextReader, reader);
 
   value = xmlTextReaderReadOuterXml(reader);
-	
+
   if(value) {
     str = NOKOGIRI_STR_NEW2((char*)value);
     xmlFree(value);
@@ -620,6 +620,24 @@ static VALUE from_io(int argc, VALUE *argv, VALUE klass)
   return rb_reader;
 }
 
+/*
+ * call-seq:
+ *   reader.empty_element? # => true or false
+ *
+ * Returns true if the current node is empty, otherwise false.
+ */
+static VALUE empty_element_p(VALUE self)
+{
+  xmlTextReaderPtr reader;
+
+  Data_Get_Struct(self, xmlTextReader, reader);
+
+  if(xmlTextReaderIsEmptyElement(reader))
+    return Qtrue;
+
+  return Qfalse;
+}
+
 VALUE cNokogiriXmlReader;
 
 void init_xml_reader()
@@ -656,6 +674,7 @@ void init_xml_reader()
   rb_define_method(klass, "attribute", reader_attribute, 1);
   rb_define_method(klass, "namespaces", namespaces, 0);
   rb_define_method(klass, "attribute_at", attribute_at, 1);
+  rb_define_method(klass, "empty_element?", empty_element_p, 0);
   rb_define_method(klass, "attributes?", attributes_eh, 0);
   rb_define_method(klass, "value?", value_eh, 0);
   rb_define_method(klass, "default?", default_eh, 0);

data/ext/nokogiri/xml_relax_ng.c

@@ -129,9 +129,6 @@ static VALUE from_document(VALUE klass, VALUE document)
   schema = xmlRelaxNGParse(ctx);
 
   xmlSetStructuredErrorFunc(NULL, NULL);
-  if (! is_2_6_16()) {
-    xmlRelaxNGFreeParserCtxt(ctx);
-  }
 
   if(NULL == schema) {
     xmlErrorPtr error = xmlGetLastError();
@@ -143,10 +140,6 @@ static VALUE from_document(VALUE klass, VALUE document)
     return Qnil;
   }
 
-  if (is_2_6_16()) {
-    xmlRelaxNGFreeParserCtxt(ctx);
-  }
-
   rb_schema = Data_Wrap_Struct(klass, 0, dealloc, schema);
   rb_iv_set(rb_schema, "@errors", errors);
 

data/ext/nokogiri/xml_xpath_context.c

@@ -227,6 +227,8 @@ static VALUE evaluate(int argc, VALUE *argv, VALUE self)
         DOC_RUBY_OBJECT(ctx->doc));
   }
 
+  xmlXPathFreeNodeSetList(xpath);
+
   return thing;
 }
 

data/lib/nokogiri.rb

@@ -6,7 +6,7 @@ ENV['PATH'] = [File.expand_path(
   File.join(File.dirname(__FILE__), "..", "ext", "nokogiri")
 ), ENV['PATH']].compact.join(';') if RbConfig::CONFIG['host_os'] =~ /(mswin|mingw)/i
 
-if defined? RUBY_ENGINE && RUBY_ENGINE == "jruby"
+if defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
   require 'isorelax.jar'
   require 'jing.jar'
   require 'nekohtml.jar'
@@ -35,7 +35,6 @@ Thanks,
 eowarn
 
 require 'nokogiri/version'
-require 'nokogiri/version_warning'
 require 'nokogiri/syntax_error'
 require 'nokogiri/xml'
 require 'nokogiri/xslt'

data/lib/nokogiri/css/generated_parser.rb

@@ -13,90 +13,90 @@ module Nokogiri
 ##### State transition tables begin ###
 
 racc_action_table = [
-     3,    55,    26,    21,    12,    24,    56,     3,    81,     1,
-    41,    12,    41,    56,     3,    23,     1,    80,    12,    18,
-    92,    91,     4,     1,     9,    10,    18,    13,    16,     4,
-    12,     9,    10,    18,    13,    16,     4,    12,     9,    10,
-     3,    13,    16,    73,    12,    12,    60,    61,     4,     1,
-    57,    10,    12,    44,    16,     4,    61,     1,    10,    18,
-    41,    16,     4,     4,     9,    10,    10,    13,    16,    16,
-     4,     3,    58,    10,     3,    13,    16,    57,    12,    12,
-    27,    82,    28,    48,    26,    51,    12,    53,    26,    51,
-    18,    53,    83,    18,     4,     9,     4,     4,     9,    10,
-    10,    63,    16,    16,     4,    66,    68,    10,    26,    51,
-    16,    53,    86,    87,    66,    68,    67,    69,    70,    62,
-    72,    59,    90,    54,    64,    67,    69,    70,    93,    72,
-    32,    34,    36,    64,    26,    51,   -22,    53,    95,    96,
-    31,   nil,    33,    35 ]
+     4,    56,    27,    22,    12,    24,    57,     4,    65,     1,
+    41,    12,    75,    57,     4,    23,     1,    82,    12,    19,
+    93,    92,     5,     1,     9,    10,    19,    13,    16,     5,
+    12,     9,    10,    19,    13,    16,     5,     5,     9,    10,
+     4,    13,    16,    16,    12,    41,    64,     4,     5,     1,
+    60,    10,    12,    59,    16,    59,    28,     1,    29,    19,
+    12,    12,     5,    62,     9,    10,    19,    13,    16,    12,
+     5,     9,    83,    10,    12,    13,    16,    84,     5,     5,
+    63,    10,    10,    12,    16,    16,    58,     5,    61,    62,
+    10,     4,     5,    16,    87,    10,    27,    53,    16,    54,
+    49,     5,    88,    41,    10,    68,    70,    16,    27,    53,
+    19,    54,    44,    91,    21,     9,    69,    71,    72,    94,
+    74,    68,    70,   -23,    66,    33,    35,    37,    27,    53,
+    96,    54,    69,    71,    72,    32,    74,    34,    36,    97,
+    66,    27,    53,   nil,    54 ]
 
 racc_action_check = [
-     0,    20,     3,     3,     0,     3,    43,    30,    52,     0,
-    39,    30,    11,    20,    56,     3,    30,    43,    56,     0,
-    71,    71,     0,    56,     0,     0,    30,     0,     0,    30,
-     8,    30,    30,    56,    30,    30,    56,     6,    56,    56,
-     9,    56,    56,    28,     9,     7,    24,    24,     8,     9,
-    51,     8,    41,    10,     8,     6,    53,    41,     6,     9,
-     7,     6,     9,     7,     9,     9,     7,     9,     9,     7,
-    41,     4,    21,    41,    16,    41,    41,    21,    15,    17,
-     4,    54,     4,    16,    63,    63,    77,    63,    61,    61,
-     4,    61,    55,    16,    14,     4,    15,    17,    16,    15,
-    17,    26,    15,    17,    77,    29,    29,    77,    57,    57,
-    77,    57,    58,    60,    27,    27,    29,    29,    29,    25,
-    29,    22,    65,    19,    29,    27,    27,    27,    74,    27,
-     5,     5,     5,    27,    18,    18,     1,    18,    79,    87,
-     5,   nil,     5,     5 ]
+     0,    20,     4,     4,     0,     4,    43,     9,    27,     0,
+    39,     9,    29,    20,    31,     4,     9,    43,    31,     0,
+    73,    73,     0,    31,     0,     0,     9,     0,     0,     9,
+     7,     9,     9,    31,     9,     9,    31,    14,    31,    31,
+    57,    31,    31,    14,    57,     7,    26,     5,     7,    57,
+    22,     7,    41,    53,     7,    22,     5,    41,     5,    57,
+     8,    79,    57,    54,    57,    57,     5,    57,    57,    18,
+    41,     5,    55,    41,    17,    41,    41,    56,     8,    79,
+    25,     8,    79,    15,     8,    79,    21,    18,    24,    24,
+    18,    16,    17,    18,    60,    17,    59,    59,    17,    59,
+    16,    15,    61,    11,    15,    30,    30,    15,    19,    19,
+    16,    19,    10,    67,     2,    16,    30,    30,    30,    76,
+    30,    28,    28,     1,    30,     6,     6,     6,    62,    62,
+    81,    62,    28,    28,    28,     6,    28,     6,     6,    88,
+    28,    65,    65,   nil,    65 ]
 
 racc_action_pointer = [
-    -2,   108,   nil,    -8,    69,   123,    31,    39,    24,    38,
-    42,    -9,   nil,   nil,    70,    72,    72,    73,   124,    95,
-     1,    65,    98,   nil,    35,    96,    89,   111,    18,   102,
-     5,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   -11,
+    -2,    95,    86,   nil,    -8,    45,   118,    24,    54,     5,
+   101,    82,   nil,   nil,    13,    77,    89,    68,    63,    98,
+     1,    75,    43,   nil,    77,    57,    23,    -4,   118,   -13,
+   102,    12,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   -11,
    nil,    46,   nil,    -6,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    38,   -15,    44,    70,    92,    12,    98,    99,   nil,
-   106,    78,   nil,    74,   nil,    97,   nil,   nil,   nil,   nil,
-   nil,    10,   nil,   nil,   103,   nil,   nil,    80,   nil,   115,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   126,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil ]
+   nil,   nil,   nil,    41,    51,    49,    77,    38,   nil,    86,
+    81,    95,   118,   nil,   nil,   131,   nil,    88,   nil,   nil,
+   nil,   nil,   nil,    10,   nil,   nil,    94,   nil,   nil,    55,
+   nil,   107,   nil,   nil,   nil,   nil,   nil,   nil,   126,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil ]
 
 racc_action_default = [
-   -23,   -20,    -2,   -68,   -68,   -17,   -52,   -44,   -49,   -23,
-   -68,   -15,   -53,   -21,   -12,   -51,   -68,   -50,   -68,   -68,
-   -68,   -37,   -68,   -27,   -35,   -68,   -36,   -56,   -68,   -56,
-   -23,    -5,    -3,    -8,    -4,    -7,    -6,   -48,    -9,   -43,
-   -11,   -23,   -45,   -68,   -18,   -14,   -13,   -47,   -42,   -41,
-   -46,   -37,   -68,   -35,   -68,   -68,   -23,   -68,   -68,   -28,
-   -40,   -68,   -29,   -68,   -57,   -68,   -62,   -58,   -63,   -59,
-   -60,   -68,   -61,   -26,   -68,   -16,   -10,   -65,   -67,   -68,
-   -31,   -30,   -19,    97,    -1,   -34,   -39,   -68,   -32,   -33,
-   -24,   -54,   -55,   -25,   -66,   -64,   -38 ]
+   -24,   -21,   -69,    -2,   -69,   -69,   -18,   -45,   -50,   -24,
+   -69,   -16,   -54,   -22,   -12,   -53,   -69,   -52,   -51,   -69,
+   -69,   -69,   -38,   -28,   -36,   -69,   -69,   -37,   -57,   -69,
+   -57,   -24,    -5,    -3,    -8,    -4,    -7,    -6,    -9,   -44,
+   -11,   -24,   -46,   -69,   -19,   -15,   -13,   -14,   -49,   -43,
+   -42,   -48,   -47,   -38,   -36,   -69,   -69,   -24,   -20,   -69,
+   -69,   -41,   -69,   -29,   -30,   -69,   -58,   -69,   -63,   -59,
+   -64,   -60,   -61,   -69,   -62,   -27,   -69,   -17,   -10,   -66,
+   -68,   -69,   -32,   -31,    98,    -1,   -35,   -40,   -69,   -33,
+   -34,   -25,   -55,   -56,   -26,   -67,   -65,   -39 ]
 
 racc_goto_table = [
-    37,    39,    42,    22,    40,    75,    20,    29,    45,    47,
-    65,    50,    74,    38,    46,    43,    77,    30,    52,    49,
-    25,    79,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    84,   nil,   nil,   nil,    78,    76,   nil,   nil,   nil,
+    39,    42,    25,    40,    77,    30,    20,    45,    48,    79,
+    51,    52,    67,    46,    76,    43,    50,    55,    47,    38,
+    31,    26,    81,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    85,   nil,   nil,   nil,    80,    78,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    85,   nil,   nil,
-   nil,    88,   nil,    89,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    94 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    86,   nil,   nil,
+    89,   nil,   nil,    90,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    95 ]
 
 racc_goto_check = [
-     7,     7,     7,    14,     8,     2,     1,     9,     8,     7,
-    13,     7,    13,     6,    10,     1,     5,     3,    14,     9,
-    15,    19,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,     2,   nil,   nil,   nil,     7,     8,   nil,   nil,   nil,
+     7,     7,    15,     8,     2,     9,     1,     8,     7,     5,
+     7,     7,    14,    10,    14,     1,     9,    15,    11,     6,
+     3,    16,    19,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+     2,   nil,   nil,   nil,     7,     8,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    14,   nil,   nil,
-   nil,    14,   nil,    14,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,     7 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    15,   nil,   nil,
+    15,   nil,   nil,    15,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,     7 ]
 
 racc_goto_pointer = [
-   nil,     6,   -25,    12,   nil,   -25,     6,    -6,    -3,     3,
-     0,   nil,   nil,   -17,     0,    17,   nil,   nil,   nil,   -20 ]
+   nil,     6,   -27,    14,   nil,   -32,    12,    -7,    -4,     0,
+    -1,     4,   nil,   nil,   -16,    -2,    17,   nil,   nil,   -19 ]
 
 racc_goto_default = [
-   nil,   nil,     2,   nil,     5,     7,   nil,    11,   nil,    14,
-    15,    17,    19,   nil,   nil,   nil,     6,     8,    71,   nil ]
+   nil,   nil,     3,   nil,     6,     7,   nil,    11,   nil,    14,
+    15,    17,    18,     2,   nil,   nil,   nil,     8,    73,   nil ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
@@ -114,63 +114,64 @@ racc_reduce_table = [
   1, 35, :_reduce_none,
   2, 35, :_reduce_13,
   2, 35, :_reduce_14,
-  1, 35, :_reduce_15,
-  3, 33, :_reduce_16,
+  2, 35, :_reduce_15,
+  1, 35, :_reduce_16,
+  3, 33, :_reduce_17,
   1, 33, :_reduce_none,
-  2, 42, :_reduce_18,
-  3, 36, :_reduce_19,
-  1, 36, :_reduce_20,
+  2, 43, :_reduce_19,
+  3, 36, :_reduce_20,
   1, 36, :_reduce_21,
-  1, 43, :_reduce_22,
-  0, 43, :_reduce_none,
-  4, 41, :_reduce_24,
-  4, 41, :_reduce_25,
-  3, 41, :_reduce_26,
-  2, 40, :_reduce_27,
-  3, 40, :_reduce_28,
+  1, 36, :_reduce_22,
+  1, 44, :_reduce_23,
+  0, 44, :_reduce_none,
+  4, 42, :_reduce_25,
+  4, 42, :_reduce_26,
+  3, 42, :_reduce_27,
+  2, 40, :_reduce_28,
   3, 40, :_reduce_29,
   3, 40, :_reduce_30,
   3, 40, :_reduce_31,
-  3, 45, :_reduce_32,
-  3, 45, :_reduce_33,
-  3, 45, :_reduce_34,
-  1, 45, :_reduce_none,
-  1, 45, :_reduce_none,
-  1, 45, :_reduce_37,
-  4, 46, :_reduce_38,
-  3, 46, :_reduce_39,
-  2, 46, :_reduce_40,
+  3, 40, :_reduce_32,
+  3, 46, :_reduce_33,
+  3, 46, :_reduce_34,
+  3, 46, :_reduce_35,
+  1, 46, :_reduce_none,
+  1, 46, :_reduce_none,
+  1, 46, :_reduce_38,
+  4, 47, :_reduce_39,
+  3, 47, :_reduce_40,
   2, 47, :_reduce_41,
-  2, 47, :_reduce_42,
+  2, 41, :_reduce_42,
+  2, 41, :_reduce_43,
   1, 37, :_reduce_none,
   0, 37, :_reduce_none,
-  2, 38, :_reduce_45,
   2, 38, :_reduce_46,
   2, 38, :_reduce_47,
   2, 38, :_reduce_48,
+  2, 38, :_reduce_49,
   1, 38, :_reduce_none,
   1, 38, :_reduce_none,
   1, 38, :_reduce_none,
   1, 38, :_reduce_none,
-  1, 48, :_reduce_53,
-  2, 44, :_reduce_54,
-  2, 44, :_reduce_55,
-  0, 44, :_reduce_none,
-  1, 49, :_reduce_57,
+  1, 48, :_reduce_54,
+  2, 45, :_reduce_55,
+  2, 45, :_reduce_56,
+  0, 45, :_reduce_none,
   1, 49, :_reduce_58,
   1, 49, :_reduce_59,
   1, 49, :_reduce_60,
   1, 49, :_reduce_61,
   1, 49, :_reduce_62,
   1, 49, :_reduce_63,
-  3, 39, :_reduce_64,
+  1, 49, :_reduce_64,
+  3, 39, :_reduce_65,
   1, 50, :_reduce_none,
   2, 50, :_reduce_none,
   1, 50, :_reduce_none ]
 
-racc_reduce_n = 68
+racc_reduce_n = 69
 
-racc_shift_n = 97
+racc_shift_n = 98
 
 racc_token_table = {
   false => 0,
@@ -267,13 +268,13 @@ Racc_token_to_s_table = [
   "hcap_1toN",
   "negation",
   "function",
+  "pseudo",
   "attrib",
   "class",
   "namespace",
   "attrib_val_0or1",
   "expr",
   "an_plus_b",
-  "pseudo",
   "attribute_id",
   "eql_incl_dash",
   "negation_arg" ]
@@ -361,6 +362,12 @@ def _reduce_13(val, _values, result)
 end
 
 def _reduce_14(val, _values, result)
+        result = Node.new(:CONDITIONAL_SELECTOR, val)
+      
+    result
+end
+
+def _reduce_15(val, _values, result)
         result = Node.new(:CONDITIONAL_SELECTOR,
           [
             Node.new(:ELEMENT_NAME, ['*']),
@@ -371,7 +378,7 @@ def _reduce_14(val, _values, result)
     result
 end
 
-def _reduce_15(val, _values, result)
+def _reduce_16(val, _values, result)
         result = Node.new(:CONDITIONAL_SELECTOR,
           [Node.new(:ELEMENT_NAME, ['*']), val.first]
         )
@@ -379,20 +386,20 @@ def _reduce_15(val, _values, result)
     result
 end
 
-def _reduce_16(val, _values, result)
+def _reduce_17(val, _values, result)
         result = Node.new(val[1], [val.first, val.last])
       
     result
 end
 
-# reduce 17 omitted
+# reduce 18 omitted
 
-def _reduce_18(val, _values, result)
+def _reduce_19(val, _values, result)
  result = Node.new(:CLASS_CONDITION, [val[1]]) 
     result
 end
 
-def _reduce_19(val, _values, result)
+def _reduce_20(val, _values, result)
         result = Node.new(:ELEMENT_NAME,
           [[val.first, val.last].compact.join(':')]
         )
@@ -400,26 +407,26 @@ def _reduce_19(val, _values, result)
     result
 end
 
-def _reduce_20(val, _values, result)
+def _reduce_21(val, _values, result)
         name = @namespaces.key?('xmlns') ? "xmlns:#{val.first}" : val.first
         result = Node.new(:ELEMENT_NAME, [name])
       
     result
 end
 
-def _reduce_21(val, _values, result)
+def _reduce_22(val, _values, result)
  result = Node.new(:ELEMENT_NAME, val) 
     result
 end
 
-def _reduce_22(val, _values, result)
+def _reduce_23(val, _values, result)
  result = val[0] 
     result
 end
 
-# reduce 23 omitted
+# reduce 24 omitted
 
-def _reduce_24(val, _values, result)
+def _reduce_25(val, _values, result)
         result = Node.new(:ATTRIBUTE_CONDITION,
           [Node.new(:ELEMENT_NAME, [val[1]])] + (val[2] || [])
         )
@@ -427,7 +434,7 @@ def _reduce_24(val, _values, result)
     result
 end
 
-def _reduce_25(val, _values, result)
+def _reduce_26(val, _values, result)
         result = Node.new(:ATTRIBUTE_CONDITION,
           [val[1]] + (val[2] || [])
         )
@@ -435,7 +442,7 @@ def _reduce_25(val, _values, result)
     result
 end
 
-def _reduce_26(val, _values, result)
+def _reduce_27(val, _values, result)
         # Non standard, but hpricot supports it.
         result = Node.new(:PSEUDO_CLASS,
           [Node.new(:FUNCTION, ['nth-child(', val[1]])]
@@ -444,14 +451,8 @@ def _reduce_26(val, _values, result)
     result
 end
 
-def _reduce_27(val, _values, result)
-        result = Node.new(:FUNCTION, [val.first.strip])
-      
-    result
-end
-
 def _reduce_28(val, _values, result)
-        result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
+        result = Node.new(:FUNCTION, [val.first.strip])
       
     result
 end
@@ -475,7 +476,8 @@ def _reduce_31(val, _values, result)
 end
 
 def _reduce_32(val, _values, result)
- result = [val.first, val.last] 
+        result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
+      
     result
 end
 
@@ -489,11 +491,16 @@ def _reduce_34(val, _values, result)
     result
 end
 
-# reduce 35 omitted
+def _reduce_35(val, _values, result)
+ result = [val.first, val.last] 
+    result
+end
 
 # reduce 36 omitted
 
-def _reduce_37(val, _values, result)
+# reduce 37 omitted
+
+def _reduce_38(val, _values, result)
         if val[0] == 'even'
           val = ["2","n","+","0"]
           result = Node.new(:AN_PLUS_B, val)
@@ -511,7 +518,7 @@ def _reduce_37(val, _values, result)
     result
 end
 
-def _reduce_38(val, _values, result)
+def _reduce_39(val, _values, result)
         if val[1] == 'n'
           result = Node.new(:AN_PLUS_B, val)
         else
@@ -521,7 +528,7 @@ def _reduce_38(val, _values, result)
     result
 end
 
-def _reduce_39(val, _values, result)
+def _reduce_40(val, _values, result)
                # n+3, -n+3
         if val[0] == 'n'
           val.unshift("1")
@@ -537,7 +544,7 @@ def _reduce_39(val, _values, result)
     result
 end
 
-def _reduce_40(val, _values, result)
+def _reduce_41(val, _values, result)
         if val[1] == 'n'
           val << "+"
           val << "0"
@@ -549,26 +556,20 @@ def _reduce_40(val, _values, result)
     result
 end
 
-def _reduce_41(val, _values, result)
+def _reduce_42(val, _values, result)
         result = Node.new(:PSEUDO_CLASS, [val[1]])
       
     result
 end
 
-def _reduce_42(val, _values, result)
+def _reduce_43(val, _values, result)
  result = Node.new(:PSEUDO_CLASS, [val[1]]) 
     result
 end
 
-# reduce 43 omitted
-
 # reduce 44 omitted
 
-def _reduce_45(val, _values, result)
-        result = Node.new(:COMBINATOR, val)
-      
-    result
-end
+# reduce 45 omitted
 
 def _reduce_46(val, _values, result)
         result = Node.new(:COMBINATOR, val)
@@ -588,7 +589,11 @@ def _reduce_48(val, _values, result)
     result
 end
 
-# reduce 49 omitted
+def _reduce_49(val, _values, result)
+        result = Node.new(:COMBINATOR, val)
+      
+    result
+end
 
 # reduce 50 omitted
 
@@ -596,70 +601,72 @@ end
 
 # reduce 52 omitted
 
-def _reduce_53(val, _values, result)
+# reduce 53 omitted
+
+def _reduce_54(val, _values, result)
  result = Node.new(:ID, val) 
     result
 end
 
-def _reduce_54(val, _values, result)
+def _reduce_55(val, _values, result)
  result = [val.first, val[1]] 
     result
 end
 
-def _reduce_55(val, _values, result)
+def _reduce_56(val, _values, result)
  result = [val.first, val[1]] 
     result
 end
 
-# reduce 56 omitted
+# reduce 57 omitted
 
-def _reduce_57(val, _values, result)
+def _reduce_58(val, _values, result)
  result = :equal 
     result
 end
 
-def _reduce_58(val, _values, result)
+def _reduce_59(val, _values, result)
  result = :prefix_match 
     result
 end
 
-def _reduce_59(val, _values, result)
+def _reduce_60(val, _values, result)
  result = :suffix_match 
     result
 end
 
-def _reduce_60(val, _values, result)
+def _reduce_61(val, _values, result)
  result = :substring_match 
     result
 end
 
-def _reduce_61(val, _values, result)
+def _reduce_62(val, _values, result)
  result = :not_equal 
     result
 end
 
-def _reduce_62(val, _values, result)
+def _reduce_63(val, _values, result)
  result = :includes 
     result
 end
 
-def _reduce_63(val, _values, result)
+def _reduce_64(val, _values, result)
  result = :dash_match 
     result
 end
 
-def _reduce_64(val, _values, result)
+def _reduce_65(val, _values, result)
         result = Node.new(:NOT, [val[1]])
       
     result
 end
 
-# reduce 65 omitted
-
 # reduce 66 omitted
 
 # reduce 67 omitted
 
+# reduce 68 omitted
+
 def _reduce_none(val, _values, result)
   val[0]
 end