nokogiri-maglev- 1.5.2 → 1.5.3

data/ext/nokogiri/extconf.rb

@@ -104,7 +104,7 @@ pkg_config('libxslt') if RUBY_PLATFORM =~ /mingw/
 asplode "libxml2"  unless find_header('libxml/parser.h')
 asplode "libxslt"  unless find_header('libxslt/xslt.h')
 asplode "libexslt" unless find_header('libexslt/exslt.h')
-# asplode "libiconv" unless have_func('iconv_open', 'iconv.h') or have_library('iconv', 'iconv_open', 'iconv.h')
+# asplode "libiconv" unless have_func('iconv_open', 'iconv.h') or have_library('iconv', 'iconv_open', 'iconv.h') or find_library('iconv', 'iconv_open', 'iconv.h')
 asplode "libxml2"  unless find_library("#{lib_prefix}xml2", 'xmlParseDoc')
 asplode "libxslt"  unless find_library("#{lib_prefix}xslt", 'xsltParseStylesheetDoc')
 asplode "libexslt" unless find_library("#{lib_prefix}exslt", 'exsltFuncRegister')

data/ext/nokogiri/nokogiri.c

@@ -45,7 +45,7 @@ void vasprintf_free (void *p)
 
 void Init_nokogiri()
 {
-#if !(defined __MACRUBY__) && !(defined MAGLEV)
+#if !defined(__MACRUBY__) && !defined(MAGLEV)
   xmlMemSetup(
       (xmlFreeFunc)ruby_xfree,
       (xmlMallocFunc)ruby_xmalloc,

data/ext/nokogiri/xml_io.c

@@ -25,7 +25,7 @@ int io_read_callback(void * ctx, char * buffer, int len) {
   safe_len = str_len > (size_t)len ? (size_t)len : str_len;
   memcpy(buffer, StringValuePtr(string), safe_len);
 
-  return safe_len;
+  return (int)safe_len;
 }
 
 VALUE write_check(VALUE *args) {

data/ext/nokogiri/xml_namespace.c

@@ -11,13 +11,10 @@ VALUE cNokogiriXmlNamespace ;
 static VALUE prefix(VALUE self)
 {
   xmlNsPtr ns;
-  xmlDocPtr doc;
 
   Data_Get_Struct(self, xmlNs, ns);
   if(!ns->prefix) return Qnil;
 
-  Data_Get_Struct(rb_iv_get(self, "@document"), xmlDoc, doc);
-
   return NOKOGIRI_STR_NEW2(ns->prefix);
 }
 
@@ -30,13 +27,10 @@ static VALUE prefix(VALUE self)
 static VALUE href(VALUE self)
 {
   xmlNsPtr ns;
-  xmlDocPtr doc;
 
   Data_Get_Struct(self, xmlNs, ns);
   if(!ns->href) return Qnil;
 
-  Data_Get_Struct(rb_iv_get(self, "@document"), xmlDoc, doc);
-
   return NOKOGIRI_STR_NEW2(ns->href);
 }
 

data/ext/nokogiri/xml_node.c

@@ -1219,7 +1219,7 @@ static VALUE process_xincludes(VALUE self, VALUE options)
 /* TODO: DOCUMENT ME */
 static VALUE in_context(VALUE self, VALUE _str, VALUE _options)
 {
-    xmlNodePtr node, list, child_iter, tmp, node_children, doc_children;
+    xmlNodePtr node, list = 0, child_iter, node_children, doc_children;
     xmlNodeSetPtr set;
     xmlParserErrors error;
     VALUE doc, err;
@@ -1257,8 +1257,8 @@ static VALUE in_context(VALUE self, VALUE _str, VALUE _options)
      * is because if there were errors, it's possible for the child pointers
      * to be manipulated. */
     if (error != XML_ERR_OK) {
-	node->doc->children = doc_children;
-	node->children = node_children;
+      node->doc->children = doc_children;
+      node->children = node_children;
     }
 
     /* make sure parent/child pointers are coherent so an unlink will work
@@ -1266,9 +1266,9 @@ static VALUE in_context(VALUE self, VALUE _str, VALUE _options)
      */
     child_iter = node->doc->children ;
     while (child_iter) {
-	if (child_iter->parent != (xmlNodePtr)node->doc)
-	    child_iter->parent = (xmlNodePtr)node->doc;
-	child_iter = child_iter->next;
+      if (child_iter->parent != (xmlNodePtr)node->doc)
+        child_iter->parent = (xmlNodePtr)node->doc;
+      child_iter = child_iter->next;
     }
 
 #ifndef HTML_PARSE_NOIMPLIED
@@ -1285,12 +1285,12 @@ static VALUE in_context(VALUE self, VALUE _str, VALUE _options)
      * https://bugzilla.gnome.org/show_bug.cgi?id=668155
      */
     if (error != XML_ERR_OK && doc_is_empty && node->doc->children != NULL) {
-	tmp = node;
-	while (tmp->parent)
-	    tmp = tmp->parent;
+      child_iter = node;
+      while (child_iter->parent)
+        child_iter = child_iter->parent;
 	
-	if (tmp->type == XML_DOCUMENT_FRAG_NODE)
-	    node->doc->children = NULL;
+      if (child_iter->type == XML_DOCUMENT_FRAG_NODE)
+        node->doc->children = NULL;
     }
 
     /* FIXME: This probably needs to handle more constants... */

data/ext/nokogiri/xml_node_set.c

@@ -427,7 +427,7 @@ VALUE Nokogiri_wrap_xml_node_set(xmlNodeSetPtr node_set, VALUE document)
     rb_funcall(document, decorate, 1, new_set);
   }
 
-  if (node_set->nodeTab) {
+  if (node_set && node_set->nodeTab) {
     for (i = 0; i < node_set->nodeNr; i++) {
       cur = node_set->nodeTab[i];
       if (cur && cur->type == XML_NAMESPACE_DECL) {

data/ext/nokogiri/xml_xpath_context.c

@@ -49,31 +49,23 @@ static VALUE register_variable(VALUE self, VALUE name, VALUE value)
    return self;
 }
 
-static void ruby_funcall(xmlXPathParserContextPtr ctx, int nargs)
+void Nokogiri_marshal_xpath_funcall_and_return_values(xmlXPathParserContextPtr ctx, int nargs, VALUE handler, const char* function_name)
 {
-  VALUE xpath_handler = Qnil;
-  VALUE result;
-  // VALUE *argv;
-  VALUE doc;
+  int i;
+  VALUE result, doc;
+  VALUE *argv;
   VALUE node_set = Qnil;
   xmlNodeSetPtr xml_node_set = NULL;
   xmlXPathObjectPtr obj;
-  int i;
   nokogiriNodeSetTuple *node_set_tuple;
 
-  assert(ctx);
-  assert(ctx->context);
-  assert(ctx->context->userData);
   assert(ctx->context->doc);
   assert(DOC_RUBY_OBJECT_TEST(ctx->context->doc));
 
-  xpath_handler = (VALUE)(ctx->context->userData);
-
-  //argv = (VALUE *)calloc((size_t)nargs, sizeof(VALUE));
-  //for (i = 0 ; i < nargs ; ++i) {
-  //  rb_gc_register_address(&argv[i]);
-  //}
-  VALUE argv = rb_ary_new2(nargs);
+  // argv = (VALUE *)calloc((size_t)nargs, sizeof(VALUE));
+  // for (i = 0 ; i < nargs ; ++i) {
+  //   rb_gc_register_address(&argv[i]);
+  // }
 
   doc = DOC_RUBY_OBJECT(ctx->context->doc);
 
@@ -83,29 +75,25 @@ static void ruby_funcall(xmlXPathParserContextPtr ctx, int nargs)
       obj = valuePop(ctx);
       switch(obj->type) {
         case XPATH_STRING:
-          rb_ary_store( argv, i, NOKOGIRI_STR_NEW2(obj->stringval));
+          rb_ary_store(argv, i, NOKOGIRI_STR_NEW2(obj->stringval));
           break;
         case XPATH_BOOLEAN:
-          rb_ary_store( argv, i, obj->boolval == 1 ? Qtrue : Qfalse);
+          rb_ary_store(argv, i, obj->boolval == 1 ? Qtrue : Qfalse);
           break;
         case XPATH_NUMBER:
-          rb_ary_store( argv, i, rb_float_new(obj->floatval));
+          rb_ary_store(argv, i, rb_float_new(obj->floatval));
           break;
         case XPATH_NODESET:
-          rb_ary_store( argv, i, Nokogiri_wrap_xml_node_set(obj->nodesetval, doc));
+          rb_ary_store(argv, i, Nokogiri_wrap_xml_node_set(obj->nodesetval, doc));
           break;
         default:
-          rb_ary_store( argv, i, NOKOGIRI_STR_NEW2(xmlXPathCastToString(obj)));
+          rb_ary_store(argv, i, NOKOGIRI_STR_NEW2(xmlXPathCastToString(obj)));
       }
       xmlXPathFreeNodeSetList(obj);
     } while(i-- > 0);
   }
 
-  result = rb_funcall2_(
-      xpath_handler,
-      rb_intern((const char *)ctx->context->function),
-      nargs, argv
-  );
+  result = rb_funcall2(handler, rb_intern((const char*)function_name), nargs, argv);
 
   // for (i = 0 ; i < nargs ; ++i) {
   //  rb_gc_unregister_address(&argv[i]);
@@ -126,7 +114,7 @@ static void ruby_funcall(xmlXPathParserContextPtr ctx, int nargs)
       char *res_str = (char*)res_cstr;
       xmlXPathReturnString(
           ctx,
-          xmlCharStrdup(StringValuePtr(res_str))
+          xmlCharStrdup(res_str)
       );
       }
       break;
@@ -162,6 +150,22 @@ static void ruby_funcall(xmlXPathParserContextPtr ctx, int nargs)
   }
 }
 
+static void ruby_funcall(xmlXPathParserContextPtr ctx, int nargs)
+{
+  VALUE handler = Qnil;
+  const char *function = NULL ;
+
+  assert(ctx);
+  assert(ctx->context);
+  assert(ctx->context->userData);
+  assert(ctx->context->function);
+
+  handler = (VALUE)(ctx->context->userData);
+  function = (const char*)(ctx->context->function);
+
+  Nokogiri_marshal_xpath_funcall_and_return_values(ctx, nargs, handler, function);
+}
+
 static xmlXPathFunction lookup( void *ctx,
                                 const xmlChar * name,
                                 const xmlChar* ns_uri )

data/ext/nokogiri/xml_xpath_context.h

@@ -4,6 +4,7 @@
 #include <nokogiri.h>
 
 void init_xml_xpath_context();
+void Nokogiri_marshal_xpath_funcall_and_return_values(xmlXPathParserContextPtr ctx, int nargs, VALUE handler, const char* function_name) ;
 
 extern VALUE cNokogiriXmlXpathContext;
 #endif

data/ext/nokogiri/xslt_stylesheet.c

@@ -168,74 +168,17 @@ static VALUE transform(int argc, VALUE* argv, VALUE self)
 
 static void method_caller(xmlXPathParserContextPtr ctxt, int nargs)
 {
-    const xmlChar * function;
-    const xmlChar * functionURI;
-    size_t i, count;
-
+    VALUE handler;
+    const char *function_name;
     xsltTransformContextPtr transform;
-    xmlXPathObjectPtr xpath;
-    VALUE obj;
-    VALUE *args;
-    VALUE result;
+    const xmlChar *functionURI;
 
     transform = xsltXPathGetTransformContext(ctxt);
-
-    function = ctxt->context->function;
     functionURI = ctxt->context->functionURI;
-    obj = (VALUE)xsltGetExtData(transform, functionURI);
-
-    count = (size_t)ctxt->valueNr;
-    args = calloc(count, sizeof(VALUE *));
-
-    for(i = 0; i < count; i++) {
-	VALUE thing;
-
-	xpath = valuePop(ctxt);
-	switch(xpath->type) {
-	    case XPATH_STRING:
-		thing = NOKOGIRI_STR_NEW2(xpath->stringval);
-		break;
-	    case XPATH_NODESET:
-		if(NULL == xpath->nodesetval) {
-		    thing = Nokogiri_wrap_xml_node_set(
-			    xmlXPathNodeSetCreate(NULL),
-			    DOC_RUBY_OBJECT(ctxt->context->doc));
-		} else {
-		    thing = Nokogiri_wrap_xml_node_set(xpath->nodesetval,
-			    DOC_RUBY_OBJECT(ctxt->context->doc));
-		}
-		break;
-	    default:
-		rb_raise(rb_eRuntimeError, "do not handle type: %d", xpath->type);
-	}
-	args[i] = thing;
-	xmlFree(xpath);
-    }
-    result = rb_funcall3(obj, rb_intern((const char *)function), (int)count, args);
-    free(args);
-    switch(TYPE(result)) {
-	case T_FLOAT:
-	case T_BIGNUM:
-	case T_FIXNUM:
-	    xmlXPathReturnNumber(ctxt, NUM2DBL(result));
-	    break;
-	case T_STRING:
-	    xmlXPathReturnString(
-		    ctxt,
-		    xmlStrdup((xmlChar *)StringValuePtr(result))
-		    );
-	    break;
-	case T_TRUE:
-	    xmlXPathReturnTrue(ctxt);
-	    break;
-	case T_FALSE:
-	    xmlXPathReturnFalse(ctxt);
-	    break;
-	case T_NIL:
-	    break;
-	default:
-	    rb_raise(rb_eRuntimeError, "Invalid return type");
-    }
+    handler = (VALUE)xsltGetExtData(transform, functionURI);
+    function_name = (const char*)(ctxt->context->function);
+
+    Nokogiri_marshal_xpath_funcall_and_return_values(ctxt, nargs, handler, (const char*)function_name);
 }
 
 static void * initFunc(xsltTransformContextPtr ctxt, const xmlChar *uri)

data/lib/nokogiri/css/node.rb

@@ -1,6 +1,8 @@
 module Nokogiri
   module CSS
     class Node
+      ALLOW_COMBINATOR_ON_SELF = [:DIRECT_ADJACENT_SELECTOR, :FOLLOWING_SELECTOR, :CHILD_SELECTOR]
+
       # Get the type of this node
       attr_accessor :type
       # Get the value of this node
@@ -21,6 +23,7 @@ module Nokogiri
       # Convert this CSS node to xpath with +prefix+ using +visitor+
       def to_xpath prefix = '//', visitor = XPathVisitor.new
         self.preprocess!
+        prefix = '.' if ALLOW_COMBINATOR_ON_SELF.include?(type) && value.first.nil?
         prefix + visitor.accept(self)
       end
 

data/lib/nokogiri/css/parser.rb

@@ -14,168 +14,176 @@ module Nokogiri
 ##### State transition tables begin ###
 
 racc_action_table = [
-    13,    22,    47,    48,    21,    46,    84,    23,    13,    11,
-    12,    83,    21,    23,    66,    43,    16,    11,    86,    14,
-    21,    79,    12,    77,    15,     7,     9,    14,    16,    82,
-    12,    13,    15,     7,     9,    21,    16,    78,    12,    13,
-    11,     7,    85,    21,    16,    80,    47,    51,    11,    50,
-    14,    83,    21,    12,    21,    15,     7,     9,    14,    16,
-    27,    12,    21,    15,     7,     9,    21,    16,    87,    27,
-    12,    11,    12,     7,    21,     7,    16,    59,    16,    21,
-    12,    89,    13,     7,    12,    13,    16,     7,     9,   -24,
-    16,    11,    12,    42,    54,     7,    92,    12,    16,    39,
-     7,    14,    94,    16,    14,    38,    15,    74,    75,    15,
-    91,    90,    74,    75,    47,    51,    27,    50,    70,    71,
-    72,    97,    73,    70,    71,    72,    69,    73,    31,    32,
-    34,    69,    47,    51,    98,    50,    47,    51,    33,    50,
-    36,    35,    81,    80 ]
+    21,     4,     5,     7,    29,     4,     5,     7,    30,    19,
+   -26,     6,    21,     9,     8,     6,    29,     9,     8,    22,
+    31,    19,    20,    21,    23,    15,    17,    29,    24,    83,
+    31,    22,    19,    84,    20,    21,    23,    15,    17,    29,
+    24,    92,    22,    85,    19,    20,    21,    23,    15,    17,
+    20,    24,    82,    90,    22,    59,    24,    20,    89,    23,
+    15,    17,    21,    24,    88,    22,    29,     4,     5,     7,
+    23,    19,    71,    29,    91,    29,    86,     6,    19,     9,
+     8,    22,    29,    29,    20,    89,    23,    15,    17,    35,
+    24,    20,    29,    20,    15,    17,    15,    24,    35,    24,
+    20,    20,    29,    15,    15,    93,    24,    24,    21,    64,
+    20,    95,    29,    15,    97,    96,    24,    43,   -26,    46,
+    20,    52,    53,    15,    51,    98,    24,    22,    79,    80,
+    20,    99,    23,    15,    48,    42,    24,    79,    80,    75,
+    76,    77,   101,    78,    87,    86,    41,    74,    75,    76,
+    77,    35,    78,   104,    52,    56,    74,    55,    52,    56,
+   105,    55,    52,    56,   nil,    55,    52,    56,   nil,    55 ]
 
 racc_action_check = [
-     0,     1,    13,    13,     0,    13,    48,    52,    37,     0,
-     4,    48,    37,     1,    39,    13,     4,    37,    52,     0,
-    63,    45,     0,    42,     0,     0,     0,    37,     0,    47,
-    37,    23,    37,    37,    37,    23,    37,    44,    63,    15,
-    23,    63,    49,    15,    63,    50,    14,    14,    15,    14,
-    23,    51,    19,    23,     3,    23,    23,    23,    15,    23,
-    25,    15,    18,    15,    15,    15,    27,    15,    62,     3,
-    19,    27,     3,    19,    17,     3,    19,    22,     3,    20,
-    18,    67,    12,    18,    27,    16,    18,    27,    27,    11,
-    27,    12,    17,    12,    16,    17,    76,    20,    17,    10,
-    20,    12,    81,    20,    16,     7,    12,    40,    40,    16,
-    68,    68,    41,    41,    83,    83,     5,    83,    40,    40,
-    40,    84,    40,    41,    41,    41,    40,    41,     6,     6,
-     6,    41,    82,    82,    94,    82,    80,    80,     6,    80,
-     6,     6,    46,    46 ]
+     0,    14,    14,    14,     0,     0,     0,     0,     1,     0,
+    43,    14,    40,    14,    14,     0,    40,     0,     0,     0,
+     1,    40,     0,    31,     0,     0,     0,    31,     0,    47,
+    57,    40,    31,    49,    40,    13,    40,    40,    40,    13,
+    40,    57,    31,    50,    13,    31,    24,    31,    31,    31,
+    11,    31,    46,    53,    13,    24,    11,    13,    53,    13,
+    13,    13,    23,    13,    52,    24,    23,    23,    23,    23,
+    24,    23,    42,    35,    54,    28,    55,    23,    35,    23,
+    23,    23,    27,    10,    23,    56,    23,    23,    23,    33,
+    23,    35,    26,    28,    35,    35,    28,    35,    10,    28,
+    27,    10,    25,    27,    10,    67,    27,    10,    20,    30,
+    26,    72,    68,    26,    73,    73,    26,    20,    19,    20,
+    25,    21,    21,    25,    21,    81,    25,    20,    45,    45,
+    68,    83,    20,    68,    21,    18,    68,    44,    44,    45,
+    45,    45,    87,    45,    51,    51,    15,    45,    44,    44,
+    44,    12,    44,    90,    89,    89,    44,    89,    86,    86,
+   101,    86,    88,    88,   nil,    88,    22,    22,   nil,    22 ]
 
 racc_action_pointer = [
-    -2,     1,   nil,    48,   -14,    95,   121,    94,   nil,   nil,
-    70,    60,    80,    -8,    36,    37,    83,    68,    56,    46,
-    73,   nil,    77,    29,   nil,    39,   nil,    60,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,     6,   nil,     3,
-   104,   109,    -2,   nil,    14,    -2,   131,    17,    -1,    19,
-    33,    39,    -5,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    45,    14,   nil,   nil,   nil,    56,   100,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    71,   nil,   nil,   nil,
-   126,    95,   122,   104,   108,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   121,   nil,   nil,   nil,   nil ]
+    -2,     8,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    77,    26,   130,    33,    -6,   135,   nil,   nil,   106,    89,
+   106,   111,   156,    60,    44,    96,    86,    76,    69,   nil,
+   109,    21,   nil,    68,   nil,    67,   nil,   nil,   nil,   nil,
+    10,   nil,    61,   -19,   134,   125,    27,     0,   nil,    10,
+    20,   133,    52,    46,    51,    64,    73,    18,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    82,   106,   nil,
+   nil,   nil,    86,   104,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   100,   nil,   120,   nil,   nil,   148,   135,   152,   144,
+   140,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   147,   nil,   nil,   nil,   nil ]
 
 racc_action_default = [
-   -25,   -70,    -2,   -46,   -12,   -16,   -18,   -70,   -20,   -21,
-   -70,   -23,   -25,   -70,   -70,   -25,   -70,   -51,   -52,   -53,
-   -54,   -55,   -70,   -25,    -9,   -45,   -11,   -25,   -13,   -14,
-   -15,    -3,    -4,    -5,    -6,    -7,    -8,   -25,   -19,   -70,
-   -58,   -58,   -70,   -29,   -70,   -70,   -37,   -38,   -39,   -70,
-   -37,   -39,   -70,   -43,   -44,   -47,   -48,   -49,   -50,    99,
-    -1,   -10,   -70,   -67,   -69,   -17,   -22,   -70,   -70,   -59,
-   -60,   -61,   -62,   -63,   -64,   -65,   -70,   -28,   -30,   -31,
-   -70,   -42,   -70,   -70,   -70,   -32,   -33,   -66,   -68,   -26,
-   -56,   -57,   -27,   -34,   -70,   -35,   -36,   -41,   -40 ]
+   -27,   -74,    -2,    -3,    -4,    -5,    -6,    -7,    -8,    -9,
+   -50,   -13,   -17,   -27,   -20,   -74,   -22,   -23,   -74,   -25,
+   -27,   -74,   -74,   -27,   -74,   -55,   -56,   -57,   -58,   -59,
+   -74,   -27,   -10,   -49,   -12,   -27,   -14,   -15,   -16,   -18,
+   -27,   -21,   -74,   -32,   -62,   -62,   -74,   -74,   -33,   -74,
+   -74,   -41,   -42,   -43,   -74,   -41,   -43,   -74,   -47,   -48,
+   -51,   -52,   -53,   -54,   106,    -1,   -11,   -74,   -71,   -73,
+   -19,   -24,   -74,   -74,   -63,   -64,   -65,   -66,   -67,   -68,
+   -69,   -74,   -30,   -74,   -34,   -35,   -74,   -46,   -74,   -74,
+   -74,   -36,   -37,   -70,   -72,   -28,   -60,   -61,   -29,   -31,
+   -38,   -74,   -39,   -40,   -45,   -44 ]
 
 racc_goto_table = [
-    44,    49,    25,    26,    40,    30,     1,    41,    60,    67,
-    76,    53,    28,    29,    63,    24,    55,    56,    57,    58,
-    37,    52,    65,    45,    62,    61,    64,   nil,   nil,   nil,
+    49,    54,    33,    39,    36,     1,    34,    45,    38,    72,
+    81,    58,    32,    37,    47,    44,    68,    60,    61,    62,
+    63,    65,    40,    50,    67,   nil,   nil,    69,    57,    66,
+    70,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    88,   nil,   nil,   nil,   nil,    93,   nil,    95,
-    96 ]
+    94,   nil,   nil,   nil,   nil,   100,   nil,   102,   103 ]
 
 racc_goto_check = [
-    16,    16,     7,     8,    13,     8,     1,     9,     2,    15,
-    15,     9,    10,    11,     5,     6,     7,     7,     7,     7,
-     3,     1,     2,    17,    20,     8,     7,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    18,    18,     8,     2,    11,     1,     9,    10,     9,    17,
+    17,    10,     7,    12,    15,    16,     6,     8,     8,     8,
+     8,     2,     4,    19,    22,   nil,   nil,     8,     1,     9,
+     2,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,     7,   nil,   nil,   nil,   nil,    16,   nil,    16,
-    16 ]
+     8,   nil,   nil,   nil,   nil,    18,   nil,    18,    18 ]
 
 racc_goto_pointer = [
-   nil,     6,   -15,    14,   nil,   -13,    12,    -1,     0,    -5,
-     8,     9,   nil,    -8,   nil,   -31,   -13,    10,   nil,   nil,
-    -3 ]
+   nil,     5,   -10,   nil,     8,   nil,   -19,     2,    -8,    -4,
+   -13,    -7,     2,   nil,   nil,    -6,    -5,   -35,   -21,     2,
+   nil,   nil,   -11 ]
 
 racc_goto_default = [
-   nil,   nil,     2,   nil,     6,     3,   nil,     5,   nil,     4,
-    20,    19,    18,     8,    10,   nil,   nil,   nil,    17,    68,
-   nil ]
+   nil,   nil,     3,     2,    13,    14,    10,   nil,    12,   nil,
+    11,    28,    27,    26,    16,    18,   nil,   nil,   nil,   nil,
+    25,    73,   nil ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
   3, 32, :_reduce_1,
   1, 32, :_reduce_2,
-  1, 34, :_reduce_3,
-  1, 34, :_reduce_4,
-  1, 34, :_reduce_5,
-  1, 34, :_reduce_6,
-  1, 34, :_reduce_7,
-  1, 34, :_reduce_8,
-  2, 35, :_reduce_9,
-  3, 35, :_reduce_10,
-  2, 35, :_reduce_11,
-  1, 35, :_reduce_none,
-  2, 35, :_reduce_13,
-  2, 35, :_reduce_14,
-  2, 35, :_reduce_15,
-  1, 35, :_reduce_16,
-  3, 33, :_reduce_17,
-  1, 33, :_reduce_none,
-  2, 43, :_reduce_19,
+  1, 32, :_reduce_3,
+  1, 35, :_reduce_4,
+  1, 35, :_reduce_5,
+  1, 35, :_reduce_6,
+  1, 35, :_reduce_7,
+  1, 35, :_reduce_8,
+  1, 35, :_reduce_9,
+  2, 36, :_reduce_10,
+  3, 36, :_reduce_11,
+  2, 36, :_reduce_12,
   1, 36, :_reduce_none,
-  1, 36, :_reduce_21,
-  3, 44, :_reduce_22,
-  1, 44, :_reduce_23,
-  1, 45, :_reduce_24,
-  0, 45, :_reduce_none,
-  4, 42, :_reduce_26,
-  4, 42, :_reduce_27,
-  3, 42, :_reduce_28,
-  2, 40, :_reduce_29,
-  3, 40, :_reduce_30,
-  3, 40, :_reduce_31,
-  3, 40, :_reduce_32,
-  3, 40, :_reduce_33,
-  3, 47, :_reduce_34,
-  3, 47, :_reduce_35,
-  3, 47, :_reduce_36,
-  1, 47, :_reduce_none,
-  1, 47, :_reduce_none,
-  1, 47, :_reduce_39,
-  4, 48, :_reduce_40,
-  3, 48, :_reduce_41,
-  2, 48, :_reduce_42,
-  2, 41, :_reduce_43,
-  2, 41, :_reduce_44,
+  2, 36, :_reduce_14,
+  2, 36, :_reduce_15,
+  2, 36, :_reduce_16,
+  1, 36, :_reduce_17,
+  2, 34, :_reduce_18,
+  3, 33, :_reduce_19,
+  1, 33, :_reduce_none,
+  2, 44, :_reduce_21,
   1, 37, :_reduce_none,
-  0, 37, :_reduce_none,
-  2, 38, :_reduce_47,
-  2, 38, :_reduce_48,
-  2, 38, :_reduce_49,
-  2, 38, :_reduce_50,
-  1, 38, :_reduce_none,
-  1, 38, :_reduce_none,
-  1, 38, :_reduce_none,
-  1, 38, :_reduce_none,
-  1, 49, :_reduce_55,
-  2, 46, :_reduce_56,
-  2, 46, :_reduce_57,
+  1, 37, :_reduce_23,
+  3, 45, :_reduce_24,
+  1, 45, :_reduce_25,
+  1, 46, :_reduce_26,
   0, 46, :_reduce_none,
-  1, 50, :_reduce_59,
-  1, 50, :_reduce_60,
-  1, 50, :_reduce_61,
-  1, 50, :_reduce_62,
-  1, 50, :_reduce_63,
-  1, 50, :_reduce_64,
-  1, 50, :_reduce_65,
-  3, 39, :_reduce_66,
-  1, 51, :_reduce_none,
-  2, 51, :_reduce_none,
-  1, 51, :_reduce_none ]
-
-racc_reduce_n = 70
-
-racc_shift_n = 99
+  4, 43, :_reduce_28,
+  4, 43, :_reduce_29,
+  3, 43, :_reduce_30,
+  3, 47, :_reduce_31,
+  1, 47, :_reduce_32,
+  2, 41, :_reduce_33,
+  3, 41, :_reduce_34,
+  3, 41, :_reduce_35,
+  3, 41, :_reduce_36,
+  3, 41, :_reduce_37,
+  3, 49, :_reduce_38,
+  3, 49, :_reduce_39,
+  3, 49, :_reduce_40,
+  1, 49, :_reduce_none,
+  1, 49, :_reduce_none,
+  1, 49, :_reduce_43,
+  4, 50, :_reduce_44,
+  3, 50, :_reduce_45,
+  2, 50, :_reduce_46,
+  2, 42, :_reduce_47,
+  2, 42, :_reduce_48,
+  1, 38, :_reduce_none,
+  0, 38, :_reduce_none,
+  2, 39, :_reduce_51,
+  2, 39, :_reduce_52,
+  2, 39, :_reduce_53,
+  2, 39, :_reduce_54,
+  1, 39, :_reduce_none,
+  1, 39, :_reduce_none,
+  1, 39, :_reduce_none,
+  1, 39, :_reduce_none,
+  1, 51, :_reduce_59,
+  2, 48, :_reduce_60,
+  2, 48, :_reduce_61,
+  0, 48, :_reduce_none,
+  1, 52, :_reduce_63,
+  1, 52, :_reduce_64,
+  1, 52, :_reduce_65,
+  1, 52, :_reduce_66,
+  1, 52, :_reduce_67,
+  1, 52, :_reduce_68,
+  1, 52, :_reduce_69,
+  3, 40, :_reduce_70,
+  1, 53, :_reduce_none,
+  2, 53, :_reduce_none,
+  1, 53, :_reduce_none ]
+
+racc_reduce_n = 74
+
+racc_shift_n = 106
 
 racc_token_table = {
   false => 0,
@@ -265,6 +273,7 @@ Racc_token_to_s_table = [
   "$start",
   "selector",
   "simple_selector_1toN",
+  "prefixless_combinator_selector",
   "combinator",
   "simple_selector",
   "element_name",
@@ -277,6 +286,7 @@ Racc_token_to_s_table = [
   "class",
   "namespaced_ident",
   "namespace",
+  "attrib_name",
   "attrib_val_0or1",
   "expr",
   "an_plus_b",
@@ -302,22 +312,22 @@ def _reduce_2(val, _values, result)
 end
 
 def _reduce_3(val, _values, result)
- result = :DIRECT_ADJACENT_SELECTOR 
+ result = val.flatten 
     result
 end
 
 def _reduce_4(val, _values, result)
- result = :CHILD_SELECTOR 
+ result = :DIRECT_ADJACENT_SELECTOR 
     result
 end
 
 def _reduce_5(val, _values, result)
- result = :PRECEDING_SELECTOR 
+ result = :CHILD_SELECTOR 
     result
 end
 
 def _reduce_6(val, _values, result)
- result = :DESCENDANT_SELECTOR 
+ result = :FOLLOWING_SELECTOR 
     result
 end
 
@@ -327,11 +337,16 @@ def _reduce_7(val, _values, result)
 end
 
 def _reduce_8(val, _values, result)
- result = :CHILD_SELECTOR 
+ result = :DESCENDANT_SELECTOR 
     result
 end
 
 def _reduce_9(val, _values, result)
+ result = :CHILD_SELECTOR 
+    result
+end
+
+def _reduce_10(val, _values, result)
         result =  if val[1].nil?
                     val.first
                   else
@@ -341,7 +356,7 @@ def _reduce_9(val, _values, result)
     result
 end
 
-def _reduce_10(val, _values, result)
+def _reduce_11(val, _values, result)
         result = Node.new(:CONDITIONAL_SELECTOR,
           [
             val.first,
@@ -352,27 +367,27 @@ def _reduce_10(val, _values, result)
     result
 end
 
-def _reduce_11(val, _values, result)
+def _reduce_12(val, _values, result)
         result = Node.new(:CONDITIONAL_SELECTOR, val)
       
     result
 end
 
-# reduce 12 omitted
+# reduce 13 omitted
 
-def _reduce_13(val, _values, result)
+def _reduce_14(val, _values, result)
         result = Node.new(:CONDITIONAL_SELECTOR, val)
       
     result
 end
 
-def _reduce_14(val, _values, result)
+def _reduce_15(val, _values, result)
         result = Node.new(:CONDITIONAL_SELECTOR, val)
       
     result
 end
 
-def _reduce_15(val, _values, result)
+def _reduce_16(val, _values, result)
         result = Node.new(:CONDITIONAL_SELECTOR,
           [
             Node.new(:ELEMENT_NAME, ['*']),
@@ -383,7 +398,7 @@ def _reduce_15(val, _values, result)
     result
 end
 
-def _reduce_16(val, _values, result)
+def _reduce_17(val, _values, result)
         result = Node.new(:CONDITIONAL_SELECTOR,
           [Node.new(:ELEMENT_NAME, ['*']), val.first]
         )
@@ -391,27 +406,33 @@ def _reduce_16(val, _values, result)
     result
 end
 
-def _reduce_17(val, _values, result)
-        result = Node.new(val[1], [val.first, val.last])
+def _reduce_18(val, _values, result)
+        result = Node.new(val.first, [nil, val.last])
       
     result
 end
 
-# reduce 18 omitted
-
 def _reduce_19(val, _values, result)
- result = Node.new(:CLASS_CONDITION, [val[1]]) 
+        result = Node.new(val[1], [val.first, val.last])
+      
     result
 end
 
 # reduce 20 omitted
 
 def _reduce_21(val, _values, result)
+ result = Node.new(:CLASS_CONDITION, [val[1]]) 
+    result
+end
+
+# reduce 22 omitted
+
+def _reduce_23(val, _values, result)
  result = Node.new(:ELEMENT_NAME, val) 
     result
 end
 
-def _reduce_22(val, _values, result)
+def _reduce_24(val, _values, result)
         result = Node.new(:ELEMENT_NAME,
           [[val.first, val.last].compact.join(':')]
         )
@@ -419,21 +440,21 @@ def _reduce_22(val, _values, result)
     result
 end
 
-def _reduce_23(val, _values, result)
+def _reduce_25(val, _values, result)
         name = @namespaces.key?('xmlns') ? "xmlns:#{val.first}" : val.first
         result = Node.new(:ELEMENT_NAME, [name])
       
     result
 end
 
-def _reduce_24(val, _values, result)
+def _reduce_26(val, _values, result)
  result = val[0] 
     result
 end
 
-# reduce 25 omitted
+# reduce 27 omitted
 
-def _reduce_26(val, _values, result)
+def _reduce_28(val, _values, result)
         result = Node.new(:ATTRIBUTE_CONDITION,
           [val[1]] + (val[2] || [])
         )
@@ -441,7 +462,7 @@ def _reduce_26(val, _values, result)
     result
 end
 
-def _reduce_27(val, _values, result)
+def _reduce_29(val, _values, result)
         result = Node.new(:ATTRIBUTE_CONDITION,
           [val[1]] + (val[2] || [])
         )
@@ -449,7 +470,7 @@ def _reduce_27(val, _values, result)
     result
 end
 
-def _reduce_28(val, _values, result)
+def _reduce_30(val, _values, result)
         # Non standard, but hpricot supports it.
         result = Node.new(:PSEUDO_CLASS,
           [Node.new(:FUNCTION, ['nth-child(', val[1]])]
@@ -458,56 +479,72 @@ def _reduce_28(val, _values, result)
     result
 end
 
-def _reduce_29(val, _values, result)
+def _reduce_31(val, _values, result)
+        result = Node.new(:ELEMENT_NAME,
+          [[val.first, val.last].compact.join(':')]
+        )
+      
+    result
+end
+
+def _reduce_32(val, _values, result)
+        # Default namespace is not applied to attributes.
+        # So we don't add prefix "xmlns:" as in namespaced_ident.
+        result = Node.new(:ELEMENT_NAME, [val.first])
+      
+    result
+end
+
+def _reduce_33(val, _values, result)
         result = Node.new(:FUNCTION, [val.first.strip])
       
     result
 end
 
-def _reduce_30(val, _values, result)
+def _reduce_34(val, _values, result)
         result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
       
     result
 end
 
-def _reduce_31(val, _values, result)
+def _reduce_35(val, _values, result)
         result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
       
     result
 end
 
-def _reduce_32(val, _values, result)
+def _reduce_36(val, _values, result)
         result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
       
     result
 end
 
-def _reduce_33(val, _values, result)
+def _reduce_37(val, _values, result)
         result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
       
     result
 end
 
-def _reduce_34(val, _values, result)
+def _reduce_38(val, _values, result)
  result = [val.first, val.last] 
     result
 end
 
-def _reduce_35(val, _values, result)
+def _reduce_39(val, _values, result)
  result = [val.first, val.last] 
     result
 end
 
-def _reduce_36(val, _values, result)
+def _reduce_40(val, _values, result)
  result = [val.first, val.last] 
     result
 end
 
-# reduce 37 omitted
+# reduce 41 omitted
 
-# reduce 38 omitted
+# reduce 42 omitted
 
-def _reduce_39(val, _values, result)
+def _reduce_43(val, _values, result)
         if val[0] == 'even'
           val = ["2","n","+","0"]
           result = Node.new(:AN_PLUS_B, val)
@@ -525,7 +562,7 @@ def _reduce_39(val, _values, result)
     result
 end
 
-def _reduce_40(val, _values, result)
+def _reduce_44(val, _values, result)
         if val[1] == 'n'
           result = Node.new(:AN_PLUS_B, val)
         else
@@ -535,7 +572,7 @@ def _reduce_40(val, _values, result)
     result
 end
 
-def _reduce_41(val, _values, result)
+def _reduce_45(val, _values, result)
                # n+3, -n+3
         if val[0] == 'n'
           val.unshift("1")
@@ -551,7 +588,7 @@ def _reduce_41(val, _values, result)
     result
 end
 
-def _reduce_42(val, _values, result)
+def _reduce_46(val, _values, result)
         if val[1] == 'n'
           val << "+"
           val << "0"
@@ -563,116 +600,116 @@ def _reduce_42(val, _values, result)
     result
 end
 
-def _reduce_43(val, _values, result)
+def _reduce_47(val, _values, result)
         result = Node.new(:PSEUDO_CLASS, [val[1]])
       
     result
 end
 
-def _reduce_44(val, _values, result)
+def _reduce_48(val, _values, result)
  result = Node.new(:PSEUDO_CLASS, [val[1]]) 
     result
 end
 
-# reduce 45 omitted
+# reduce 49 omitted
 
-# reduce 46 omitted
+# reduce 50 omitted
 
-def _reduce_47(val, _values, result)
+def _reduce_51(val, _values, result)
         result = Node.new(:COMBINATOR, val)
       
     result
 end
 
-def _reduce_48(val, _values, result)
+def _reduce_52(val, _values, result)
         result = Node.new(:COMBINATOR, val)
       
     result
 end
 
-def _reduce_49(val, _values, result)
+def _reduce_53(val, _values, result)
         result = Node.new(:COMBINATOR, val)
       
     result
 end
 
-def _reduce_50(val, _values, result)
+def _reduce_54(val, _values, result)
         result = Node.new(:COMBINATOR, val)
       
     result
 end
 
-# reduce 51 omitted
+# reduce 55 omitted
 
-# reduce 52 omitted
+# reduce 56 omitted
 
-# reduce 53 omitted
+# reduce 57 omitted
 
-# reduce 54 omitted
+# reduce 58 omitted
 
-def _reduce_55(val, _values, result)
+def _reduce_59(val, _values, result)
  result = Node.new(:ID, val) 
     result
 end
 
-def _reduce_56(val, _values, result)
+def _reduce_60(val, _values, result)
  result = [val.first, val[1]] 
     result
 end
 
-def _reduce_57(val, _values, result)
+def _reduce_61(val, _values, result)
  result = [val.first, val[1]] 
     result
 end
 
-# reduce 58 omitted
+# reduce 62 omitted
 
-def _reduce_59(val, _values, result)
+def _reduce_63(val, _values, result)
  result = :equal 
     result
 end
 
-def _reduce_60(val, _values, result)
+def _reduce_64(val, _values, result)
  result = :prefix_match 
     result
 end
 
-def _reduce_61(val, _values, result)
+def _reduce_65(val, _values, result)
  result = :suffix_match 
     result
 end
 
-def _reduce_62(val, _values, result)
+def _reduce_66(val, _values, result)
  result = :substring_match 
     result
 end
 
-def _reduce_63(val, _values, result)
+def _reduce_67(val, _values, result)
  result = :not_equal 
     result
 end
 
-def _reduce_64(val, _values, result)
+def _reduce_68(val, _values, result)
  result = :includes 
     result
 end
 
-def _reduce_65(val, _values, result)
+def _reduce_69(val, _values, result)
  result = :dash_match 
     result
 end
 
-def _reduce_66(val, _values, result)
+def _reduce_70(val, _values, result)
         result = Node.new(:NOT, [val[1]])
       
     result
 end
 
-# reduce 67 omitted
+# reduce 71 omitted
 
-# reduce 68 omitted
+# reduce 72 omitted
 
-# reduce 69 omitted
+# reduce 73 omitted
 
 def _reduce_none(val, _values, result)
   val[0]