nokogiri 1.5.0-java → 1.5.1-java

data/ext/nokogiri/xml_sax_parser_context.c

@@ -19,20 +19,22 @@ static void deallocate(xmlParserCtxtPtr ctxt)
  *
  * Parse +io+ object with +encoding+
  */
-static VALUE parse_io(VALUE klass, VALUE io, VALUE encoding)
+static VALUE
+parse_io(VALUE klass, VALUE io, VALUE encoding)
 {
-  xmlCharEncoding enc = (xmlCharEncoding)NUM2INT(encoding);
-
-  xmlParserCtxtPtr ctxt = xmlCreateIOParserCtxt(
-      NULL,
-      NULL,
-      (xmlInputReadCallback)io_read_callback,
-      (xmlInputCloseCallback)io_close_callback,
-      (void *)io,
-      enc
-  );
-
-  return Data_Wrap_Struct(klass, NULL, deallocate, ctxt);
+    xmlParserCtxtPtr ctxt;
+    xmlCharEncoding enc = (xmlCharEncoding)NUM2INT(encoding);
+
+    ctxt = xmlCreateIOParserCtxt(NULL, NULL,
+				 (xmlInputReadCallback)io_read_callback,
+				 (xmlInputCloseCallback)io_close_callback,
+				 (void *)io, enc);
+    if (ctxt->sax) {
+	xmlFree(ctxt->sax);
+	ctxt->sax = NULL;
+    }
+
+    return Data_Wrap_Struct(klass, NULL, deallocate, ctxt);
 }
 
 /*
@@ -53,20 +55,44 @@ static VALUE parse_file(VALUE klass, VALUE filename)
  *
  * Parse the XML stored in memory in +data+
  */
-static VALUE parse_memory(VALUE klass, VALUE data)
+static VALUE
+parse_memory(VALUE klass, VALUE data)
 {
-  xmlParserCtxtPtr ctxt;
+    xmlParserCtxtPtr ctxt;
 
-  if(NIL_P(data)) rb_raise(rb_eArgError, "data cannot be nil");
-  if(!(int)RSTRING_LEN(data))
-    rb_raise(rb_eRuntimeError, "data cannot be empty");
+    if (NIL_P(data))
+	rb_raise(rb_eArgError, "data cannot be nil");
+    if (!(int)RSTRING_LEN(data))
+	rb_raise(rb_eRuntimeError, "data cannot be empty");
 
-  ctxt = xmlCreateMemoryParserCtxt(
-      StringValuePtr(data),
-      (int)RSTRING_LEN(data)
-  );
+    ctxt = xmlCreateMemoryParserCtxt(StringValuePtr(data),
+				     (int)RSTRING_LEN(data));
+    if (ctxt->sax) {
+	xmlFree(ctxt->sax);
+	ctxt->sax = NULL;
+    }
 
-  return Data_Wrap_Struct(klass, NULL, deallocate, ctxt);
+    return Data_Wrap_Struct(klass, NULL, deallocate, ctxt);
+}
+
+static VALUE
+parse_doc(VALUE ctxt_val)
+{
+    xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr)ctxt_val;
+    xmlParseDocument(ctxt);
+    return Qnil;
+}
+
+static VALUE
+parse_doc_finalize(VALUE ctxt_val)
+{
+    xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr)ctxt_val;
+
+    if (NULL != ctxt->myDoc)
+	xmlFreeDoc(ctxt->myDoc);
+
+    NOKOGIRI_SAX_TUPLE_DESTROY(ctxt->userData);
+    return Qnil;
 }
 
 /*
@@ -75,31 +101,28 @@ static VALUE parse_memory(VALUE klass, VALUE data)
  *
  * Use +sax_handler+ and parse the current document
  */
-static VALUE parse_with(VALUE self, VALUE sax_handler)
+static VALUE
+parse_with(VALUE self, VALUE sax_handler)
 {
-  xmlParserCtxtPtr ctxt;
-  xmlSAXHandlerPtr sax;
-
-  if(!rb_obj_is_kind_of(sax_handler, cNokogiriXmlSaxParser))
-    rb_raise(rb_eArgError, "argument must be a Nokogiri::XML::SAX::Parser");
-
-  Data_Get_Struct(self, xmlParserCtxt, ctxt);
-  Data_Get_Struct(sax_handler, xmlSAXHandler, sax);
+    xmlParserCtxtPtr ctxt;
+    xmlSAXHandlerPtr sax;
 
-  /* Free the sax handler since we'll assign our own */
-  if(ctxt->sax && ctxt->sax != (xmlSAXHandlerPtr)&xmlDefaultSAXHandler)
-    xmlFree(ctxt->sax);
+    if (!rb_obj_is_kind_of(sax_handler, cNokogiriXmlSaxParser))
+	rb_raise(rb_eArgError, "argument must be a Nokogiri::XML::SAX::Parser");
 
-  ctxt->sax = sax;
-  ctxt->userData = (void *)NOKOGIRI_SAX_TUPLE_NEW(ctxt, sax_handler);
+    Data_Get_Struct(self, xmlParserCtxt, ctxt);
+    Data_Get_Struct(sax_handler, xmlSAXHandler, sax);
 
-  xmlParseDocument(ctxt);
+    /* Free the sax handler since we'll assign our own */
+    if (ctxt->sax && ctxt->sax != (xmlSAXHandlerPtr)&xmlDefaultSAXHandler)
+	xmlFree(ctxt->sax);
 
-  if(NULL != ctxt->myDoc) xmlFreeDoc(ctxt->myDoc);
+    ctxt->sax = sax;
+    ctxt->userData = (void *)NOKOGIRI_SAX_TUPLE_NEW(ctxt, sax_handler);
 
-  NOKOGIRI_SAX_TUPLE_DESTROY(ctxt->userData);
+    rb_ensure(parse_doc, (VALUE)ctxt, parse_doc_finalize, (VALUE)ctxt);
 
-  return Qnil ;
+    return Qnil;
 }
 
 /*

data/ext/nokogiri/xml_text.c

@@ -22,6 +22,8 @@ static VALUE new(int argc, VALUE *argv, VALUE klass)
   node = xmlNewText((xmlChar *)StringValuePtr(string));
   node->doc = doc->doc;
 
+  NOKOGIRI_ROOT_NODE(node);
+
   rb_node = Nokogiri_wrap_xml_node(klass, node) ;
   rb_obj_call_init(rb_node, argc, argv);
 

data/ext/nokogiri/xml_xpath_context.c

@@ -59,6 +59,7 @@ static void ruby_funcall(xmlXPathParserContextPtr ctx, int nargs)
   xmlNodeSetPtr xml_node_set = NULL;
   xmlXPathObjectPtr obj;
   int i;
+  nokogiriNodeSetTuple *node_set_tuple;
 
   assert(ctx);
   assert(ctx->context);
@@ -75,27 +76,29 @@ static void ruby_funcall(xmlXPathParserContextPtr ctx, int nargs)
 
   doc = DOC_RUBY_OBJECT(ctx->context->doc);
 
-  i = nargs - 1;
-  do {
-    obj = valuePop(ctx);
-    switch(obj->type) {
-      case XPATH_STRING:
-        argv[i] = NOKOGIRI_STR_NEW2(obj->stringval);
-        break;
-      case XPATH_BOOLEAN:
-        argv[i] = obj->boolval == 1 ? Qtrue : Qfalse;
-        break;
-      case XPATH_NUMBER:
-        argv[i] = rb_float_new(obj->floatval);
-        break;
-      case XPATH_NODESET:
-        argv[i] = Nokogiri_wrap_xml_node_set(obj->nodesetval, doc);
-        break;
-      default:
-        argv[i] = NOKOGIRI_STR_NEW2(xmlXPathCastToString(obj));
-    }
-    xmlXPathFreeNodeSetList(obj);
-  } while(i-- > 0);
+  if (nargs > 0) {
+    i = nargs - 1;
+    do {
+      obj = valuePop(ctx);
+      switch(obj->type) {
+        case XPATH_STRING:
+          argv[i] = NOKOGIRI_STR_NEW2(obj->stringval);
+          break;
+        case XPATH_BOOLEAN:
+          argv[i] = obj->boolval == 1 ? Qtrue : Qfalse;
+          break;
+        case XPATH_NUMBER:
+          argv[i] = rb_float_new(obj->floatval);
+          break;
+        case XPATH_NODESET:
+          argv[i] = Nokogiri_wrap_xml_node_set(obj->nodesetval, doc);
+          break;
+        default:
+          argv[i] = NOKOGIRI_STR_NEW2(xmlXPathCastToString(obj));
+      }
+      xmlXPathFreeNodeSetList(obj);
+    } while(i-- > 0);
+  }
 
   result = rb_funcall2(
       xpath_handler,
@@ -118,7 +121,7 @@ static void ruby_funcall(xmlXPathParserContextPtr ctx, int nargs)
     case T_STRING:
       xmlXPathReturnString(
           ctx,
-          (xmlChar *)xmlXPathWrapCString(StringValuePtr(result))
+          xmlCharStrdup(StringValuePtr(result))
       );
       break;
     case T_TRUE:
@@ -135,13 +138,15 @@ static void ruby_funcall(xmlXPathParserContextPtr ctx, int nargs)
 	args[0] = doc;
 	args[1] = result;
         node_set = rb_class_new_instance(2, args, cNokogiriXmlNodeSet);
-        Data_Get_Struct(node_set, xmlNodeSet, xml_node_set);
+        Data_Get_Struct(node_set, nokogiriNodeSetTuple, node_set_tuple);
+	xml_node_set = node_set_tuple->node_set;
         xmlXPathReturnNodeSet(ctx, xmlXPathNodeSetMerge(NULL, xml_node_set));
       }
       break;
     case T_DATA:
       if(rb_obj_is_kind_of(result, cNokogiriXmlNodeSet)) {
-        Data_Get_Struct(result, xmlNodeSet, xml_node_set);
+        Data_Get_Struct(result, nokogiriNodeSetTuple, node_set_tuple);
+	xml_node_set = node_set_tuple->node_set;
         /* Copy the node set, otherwise it will get GC'd. */
         xmlXPathReturnNodeSet(ctx, xmlXPathNodeSetMerge(NULL, xml_node_set));
         break;
@@ -236,6 +241,7 @@ static VALUE evaluate(int argc, VALUE *argv, VALUE self)
   switch(xpath->type) {
     case XPATH_STRING:
       thing = NOKOGIRI_STR_NEW2(xpath->stringval);
+      xmlFree(xpath->stringval);
       break;
     case XPATH_NODESET:
       if(NULL == xpath->nodesetval) {

data/ext/nokogiri/xslt_stylesheet.c

@@ -10,27 +10,49 @@ VALUE xslt;
 int vasprintf (char **strp, const char *fmt, va_list ap);
 void vasprintf_free (void *p);
 
-static void dealloc(xsltStylesheetPtr doc)
+static void mark(nokogiriXsltStylesheetTuple *wrapper)
 {
+  rb_gc_mark(wrapper->func_instances);
+}
+
+static void dealloc(nokogiriXsltStylesheetTuple *wrapper)
+{
+    xsltStylesheetPtr doc = wrapper->ss;
+
     NOKOGIRI_DEBUG_START(doc);
     xsltFreeStylesheet(doc); /* commented out for now. */
     NOKOGIRI_DEBUG_END(doc);
+    
+    free(wrapper);
 }
 
-NORETURN(static void xslt_generic_error_handler(void * ctx, const char *msg, ...));
 static void xslt_generic_error_handler(void * ctx, const char *msg, ...)
 {
   char * message;
-  VALUE exception;
 
   va_list args;
   va_start(args, msg);
   vasprintf(&message, msg, args);
   va_end(args);
 
-  exception = rb_exc_new2(rb_eRuntimeError, message);
+  rb_str_cat2((VALUE)ctx, message);
+
   vasprintf_free(message);
-  rb_exc_raise(exception);
+}
+
+VALUE Nokogiri_wrap_xslt_stylesheet(xsltStylesheetPtr ss)
+{
+  VALUE self;
+  nokogiriXsltStylesheetTuple *wrapper;
+
+  self = Data_Make_Struct(cNokogiriXsltStylesheet, nokogiriXsltStylesheetTuple,
+                          mark, dealloc, wrapper);
+  
+  ss->_private = (void *)self;
+  wrapper->ss = ss;
+  wrapper->func_instances = rb_ary_new();
+
+  return self;
 }
 
 /*
@@ -41,18 +63,27 @@ static void xslt_generic_error_handler(void * ctx, const char *msg, ...)
  */
 static VALUE parse_stylesheet_doc(VALUE klass, VALUE xmldocobj)
 {
-    xmlDocPtr xml ;
+    xmlDocPtr xml, xml_cpy;
+    VALUE errstr, exception;
     xsltStylesheetPtr ss ;
     Data_Get_Struct(xmldocobj, xmlDoc, xml);
     exsltRegisterAll();
 
-    xsltSetGenericErrorFunc(NULL, xslt_generic_error_handler);
+    errstr = rb_str_new(0, 0);
+    xsltSetGenericErrorFunc((void *)errstr, xslt_generic_error_handler);
 
-    ss = xsltParseStylesheetDoc(xmlCopyDoc(xml, 1)); /* 1 => recursive */
+    xml_cpy = xmlCopyDoc(xml, 1); /* 1 => recursive */
+    ss = xsltParseStylesheetDoc(xml_cpy);
 
     xsltSetGenericErrorFunc(NULL, NULL);
 
-    return Data_Wrap_Struct(klass, NULL, dealloc, ss);
+    if (!ss) {
+	xmlFreeDoc(xml_cpy);
+	exception = rb_exc_new3(rb_eRuntimeError, errstr);
+	rb_exc_raise(exception);
+    }
+
+    return Nokogiri_wrap_xslt_stylesheet(ss);
 }
 
 
@@ -65,14 +96,14 @@ static VALUE parse_stylesheet_doc(VALUE klass, VALUE xmldocobj)
 static VALUE serialize(VALUE self, VALUE xmlobj)
 {
     xmlDocPtr xml ;
-    xsltStylesheetPtr ss ;
+    nokogiriXsltStylesheetTuple *wrapper;
     xmlChar* doc_ptr ;
     int doc_len ;
     VALUE rval ;
 
     Data_Get_Struct(xmlobj, xmlDoc, xml);
-    Data_Get_Struct(self, xsltStylesheet, ss);
-    xsltSaveResultToString(&doc_ptr, &doc_len, xml, ss);
+    Data_Get_Struct(self, nokogiriXsltStylesheetTuple, wrapper);
+    xsltSaveResultToString(&doc_ptr, &doc_len, xml, wrapper->ss);
     rval = NOKOGIRI_STR_NEW(doc_ptr, doc_len);
     xmlFree(doc_ptr);
     return rval ;
@@ -98,7 +129,7 @@ static VALUE transform(int argc, VALUE* argv, VALUE self)
     VALUE xmldoc, paramobj ;
     xmlDocPtr xml ;
     xmlDocPtr result ;
-    xsltStylesheetPtr ss ;
+    nokogiriXsltStylesheetTuple *wrapper;
     const char** params ;
     long param_len, j ;
 
@@ -116,7 +147,7 @@ static VALUE transform(int argc, VALUE* argv, VALUE self)
     Check_Type(paramobj, T_ARRAY);
 
     Data_Get_Struct(xmldoc, xmlDoc, xml);
-    Data_Get_Struct(self, xsltStylesheet, ss);
+    Data_Get_Struct(self, nokogiriXsltStylesheetTuple, wrapper);
 
     param_len = RARRAY_LEN(paramobj);
     params = calloc((size_t)param_len+1, sizeof(char*));
@@ -127,7 +158,7 @@ static VALUE transform(int argc, VALUE* argv, VALUE self)
     }
     params[param_len] = 0 ;
 
-    result = xsltApplyStylesheet(ss, xml, params);
+    result = xsltApplyStylesheet(wrapper->ss, xml, params);
     free(params);
 
     if (!result) rb_raise(rb_eRuntimeError, "could not perform xslt transform on document");
@@ -178,8 +209,10 @@ static void method_caller(xmlXPathParserContextPtr ctxt, int nargs)
 		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:
@@ -211,6 +244,8 @@ static void * initFunc(xsltTransformContextPtr ctxt, const xmlChar *uri)
     VALUE obj = rb_hash_aref(modules, rb_str_new2((const char *)uri));
     VALUE args = { Qfalse };
     VALUE methods = rb_funcall(obj, rb_intern("instance_methods"), 1, args);
+    VALUE inst;
+    nokogiriXsltStylesheetTuple *wrapper;
     int i;
 
     for(i = 0; i < RARRAY_LEN(methods); i++) {
@@ -219,12 +254,23 @@ static void * initFunc(xsltTransformContextPtr ctxt, const xmlChar *uri)
           (unsigned char *)StringValuePtr(method_name), uri, method_caller);
     }
 
-    return (void *)rb_class_new_instance(0, NULL, obj);
+    Data_Get_Struct(ctxt->style->_private, nokogiriXsltStylesheetTuple,
+                    wrapper);
+    inst = rb_class_new_instance(0, NULL, obj);
+    rb_ary_push(wrapper->func_instances, inst);
+
+    return (void *)inst;
 }
 
 static void shutdownFunc(xsltTransformContextPtr ctxt,
 	const xmlChar *uri, void *data)
 {
+    nokogiriXsltStylesheetTuple *wrapper;
+
+    Data_Get_Struct(ctxt->style->_private, nokogiriXsltStylesheetTuple,
+                    wrapper);
+
+    rb_ary_clear(wrapper->func_instances);
 }
 
 /*

data/ext/nokogiri/xslt_stylesheet.h

@@ -6,4 +6,9 @@
 void init_xslt_stylesheet();
 
 extern VALUE cNokogiriXsltStylesheet ;
+
+typedef struct _nokogiriXsltStylesheetTuple {
+  xsltStylesheetPtr ss;
+  VALUE func_instances;
+} nokogiriXsltStylesheetTuple;
 #endif

data/lib/nokogiri/css/parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.6
+# This file is automatically generated by Racc 1.4.7
 # from Racc grammer file "".
 #
 
@@ -14,90 +14,92 @@ module Nokogiri
 ##### State transition tables begin ###
 
 racc_action_table = [
-     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 ]
+     5,    57,    28,    23,    13,    25,    61,    58,     5,     1,
+     6,    60,    13,    58,    66,    24,    17,     1,    83,    20,
+    94,    93,     6,    13,     9,    11,    14,    20,    17,    42,
+     6,     5,     9,    11,    14,    13,    17,    76,    42,     5,
+     1,     6,    65,    13,    11,    62,    63,    17,     1,    60,
+    20,     5,    63,     6,    84,     9,    11,    14,    20,    17,
+     1,     6,    30,     9,    11,    14,    13,    17,    13,    85,
+    20,     1,    64,    13,    59,     9,    88,    13,    13,    89,
+    28,    54,    13,    55,     6,    42,     6,    11,    14,    11,
+    17,     6,    17,    45,    11,     6,     6,    17,    11,    11,
+     6,    17,    17,    11,     5,    92,    17,    69,    71,    28,
+    54,    22,    55,    50,    28,    54,    95,    55,    70,    72,
+    73,   -24,    75,    20,    69,    71,    67,    97,     9,    98,
+   nil,   nil,    34,    36,    38,    70,    72,    73,   nil,    75,
+   nil,   nil,    33,    67,    35,    37,    28,    54,   nil,    55 ]
 
 racc_action_check = [
-     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 ]
+     0,    21,     5,     5,     0,     5,    23,    43,     9,     0,
+    15,    23,     9,    21,    28,     5,    15,     9,    43,     0,
+    74,    74,     0,     8,     0,     0,     0,     9,     0,    40,
+     9,    32,     9,     9,     9,    32,     9,    30,     8,    58,
+    32,     8,    27,    58,     8,    25,    25,     8,    58,    54,
+    32,     6,    55,    32,    56,    32,    32,    32,    58,    32,
+     6,    58,     6,    58,    58,    58,    42,    58,    80,    57,
+     6,    42,    26,    10,    22,     6,    61,    19,    18,    62,
+    60,    60,    16,    60,    42,    12,    80,    42,    42,    80,
+    42,    10,    80,    11,    10,    19,    18,    10,    19,    18,
+    16,    19,    18,    16,    17,    68,    16,    31,    31,    20,
+    20,     4,    20,    17,    63,    63,    77,    63,    31,    31,
+    31,     1,    31,    17,    29,    29,    31,    82,    17,    89,
+   nil,   nil,     7,     7,     7,    29,    29,    29,   nil,    29,
+   nil,   nil,     7,    29,     7,     7,    66,    66,   nil,    66 ]
 
 racc_action_pointer = [
-    -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,   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 ]
+    -2,    92,   nil,   nil,    82,    -8,    49,   125,    17,     6,
+    67,    82,    64,   nil,   nil,   -14,    76,   102,    72,    71,
+    99,     1,    63,    -1,   nil,    34,    49,    19,     2,   121,
+    12,   104,    29,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+     8,   nil,    60,    -5,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    37,    40,    31,    69,    37,   nil,
+    70,    63,    72,   104,   nil,   nil,   136,   nil,    80,   nil,
+   nil,   nil,   nil,   nil,    10,   nil,   nil,    91,   nil,   nil,
+    62,   nil,   104,   nil,   nil,   nil,   nil,   nil,   nil,   116,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil ]
 
 racc_action_default = [
-   -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 ]
+   -25,   -23,   -20,    -2,   -70,   -70,   -25,   -18,   -46,   -25,
+   -51,   -70,   -16,   -55,   -21,   -12,   -54,   -70,   -53,   -52,
+   -70,   -70,   -70,   -39,   -29,   -37,   -70,   -70,   -38,   -58,
+   -70,   -58,   -25,    -5,    -3,    -8,    -4,    -7,    -6,    -9,
+   -45,   -11,   -25,   -70,   -47,   -19,   -15,   -13,   -14,   -50,
+   -44,   -43,   -49,   -48,   -39,   -37,   -70,   -70,   -25,   -22,
+   -70,   -70,   -42,   -70,   -30,   -31,   -70,   -59,   -70,   -64,
+   -60,   -65,   -61,   -62,   -70,   -63,   -28,   -70,   -17,   -10,
+   -67,   -69,   -70,   -33,   -32,    99,    -1,   -36,   -41,   -70,
+   -34,   -35,   -26,   -56,   -57,   -27,   -68,   -66,   -40 ]
 
 racc_goto_table = [
-    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,
+    40,    26,    44,    41,    78,    21,    31,    46,    49,    29,
+    52,    53,    47,    68,    43,    77,    56,    51,    48,    39,
+    80,    32,    27,    82,   nil,   nil,   nil,   nil,   nil,   nil,
+    86,   nil,   nil,   nil,    81,    79,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    86,   nil,   nil,
-    89,   nil,   nil,    90,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    95 ]
+   nil,   nil,   nil,   nil,   nil,   nil,    87,   nil,   nil,    90,
+   nil,   nil,    91,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    96 ]
 
 racc_goto_check = [
-     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,
+     7,    16,     7,     8,     2,     1,     9,     8,     7,    13,
+     7,     7,    10,    15,     1,    15,    16,     9,    11,     6,
+     5,     3,    17,    20,   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,    15,   nil,   nil,
-    15,   nil,   nil,    15,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    16,   nil,   nil,    16,
+   nil,   nil,    16,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,     7 ]
 
 racc_goto_pointer = [
-   nil,     6,   -27,    14,   nil,   -32,    12,    -7,    -4,     0,
-    -1,     4,   nil,   nil,   -16,    -2,    17,   nil,   nil,   -19 ]
+   nil,     5,   -28,    14,   nil,   -22,    11,    -8,    -5,     0,
+    -3,     3,   nil,     3,   nil,   -16,    -4,    17,   nil,   nil,
+   -19 ]
 
 racc_goto_default = [
-   nil,   nil,     3,   nil,     6,     7,   nil,    11,   nil,    14,
-    15,    17,    18,     2,   nil,   nil,   nil,     8,    73,   nil ]
+   nil,   nil,     3,   nil,     7,     8,   nil,    12,   nil,    15,
+    16,    18,    19,     2,     4,   nil,   nil,   nil,    10,    74,
+   nil ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
@@ -120,59 +122,60 @@ racc_reduce_table = [
   3, 33, :_reduce_17,
   1, 33, :_reduce_none,
   2, 43, :_reduce_19,
-  3, 36, :_reduce_20,
+  1, 36, :_reduce_none,
   1, 36, :_reduce_21,
-  1, 36, :_reduce_22,
+  3, 44, :_reduce_22,
   1, 44, :_reduce_23,
-  0, 44, :_reduce_none,
-  4, 42, :_reduce_25,
+  1, 45, :_reduce_24,
+  0, 45, :_reduce_none,
   4, 42, :_reduce_26,
-  3, 42, :_reduce_27,
-  2, 40, :_reduce_28,
-  3, 40, :_reduce_29,
+  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, 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, 41, :_reduce_42,
+  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,
   1, 37, :_reduce_none,
   0, 37, :_reduce_none,
-  2, 38, :_reduce_46,
   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, 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,
-  1, 49, :_reduce_64,
-  3, 39, :_reduce_65,
-  1, 50, :_reduce_none,
-  2, 50, :_reduce_none,
-  1, 50, :_reduce_none ]
-
-racc_reduce_n = 69
-
-racc_shift_n = 98
+  1, 49, :_reduce_55,
+  2, 46, :_reduce_56,
+  2, 46, :_reduce_57,
+  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
 
 racc_token_table = {
   false => 0,
@@ -203,8 +206,8 @@ racc_token_table = {
   :RSQUARE => 25,
   :HAS => 26,
   "." => 27,
-  "|" => 28,
-  "*" => 29,
+  "*" => 28,
+  "|" => 29,
   ":" => 30 }
 
 racc_nt_base = 31
@@ -256,8 +259,8 @@ Racc_token_to_s_table = [
   "RSQUARE",
   "HAS",
   "\".\"",
-  "\"|\"",
   "\"*\"",
+  "\"|\"",
   "\":\"",
   "$start",
   "selector",
@@ -272,6 +275,7 @@ Racc_token_to_s_table = [
   "pseudo",
   "attrib",
   "class",
+  "namespaced_ident",
   "namespace",
   "attrib_val_0or1",
   "expr",
@@ -400,7 +404,14 @@ def _reduce_19(val, _values, result)
     result
 end
 
-def _reduce_20(val, _values, result)
+# reduce 20 omitted
+
+def _reduce_21(val, _values, result)
+ result = Node.new(:ELEMENT_NAME, val) 
+    result
+end
+
+def _reduce_22(val, _values, result)
         result = Node.new(:ELEMENT_NAME,
           [[val.first, val.last].compact.join(':')]
         )
@@ -408,34 +419,29 @@ def _reduce_20(val, _values, result)
     result
 end
 
-def _reduce_21(val, _values, result)
+def _reduce_23(val, _values, result)
         name = @namespaces.key?('xmlns') ? "xmlns:#{val.first}" : val.first
         result = Node.new(:ELEMENT_NAME, [name])
       
     result
 end
 
-def _reduce_22(val, _values, result)
- result = Node.new(:ELEMENT_NAME, val) 
-    result
-end
-
-def _reduce_23(val, _values, result)
+def _reduce_24(val, _values, result)
  result = val[0] 
     result
 end
 
-# reduce 24 omitted
+# reduce 25 omitted
 
-def _reduce_25(val, _values, result)
+def _reduce_26(val, _values, result)
         result = Node.new(:ATTRIBUTE_CONDITION,
-          [Node.new(:ELEMENT_NAME, [val[1]])] + (val[2] || [])
+          [val[1]] + (val[2] || [])
         )
       
     result
 end
 
-def _reduce_26(val, _values, result)
+def _reduce_27(val, _values, result)
         result = Node.new(:ATTRIBUTE_CONDITION,
           [val[1]] + (val[2] || [])
         )
@@ -443,7 +449,7 @@ def _reduce_26(val, _values, result)
     result
 end
 
-def _reduce_27(val, _values, result)
+def _reduce_28(val, _values, result)
         # Non standard, but hpricot supports it.
         result = Node.new(:PSEUDO_CLASS,
           [Node.new(:FUNCTION, ['nth-child(', val[1]])]
@@ -452,14 +458,8 @@ def _reduce_27(val, _values, result)
     result
 end
 
-def _reduce_28(val, _values, result)
-        result = Node.new(:FUNCTION, [val.first.strip])
-      
-    result
-end
-
 def _reduce_29(val, _values, result)
-        result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
+        result = Node.new(:FUNCTION, [val.first.strip])
       
     result
 end
@@ -483,7 +483,8 @@ def _reduce_32(val, _values, result)
 end
 
 def _reduce_33(val, _values, result)
- result = [val.first, val.last] 
+        result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
+      
     result
 end
 
@@ -497,11 +498,16 @@ def _reduce_35(val, _values, result)
     result
 end
 
-# reduce 36 omitted
+def _reduce_36(val, _values, result)
+ result = [val.first, val.last] 
+    result
+end
 
 # reduce 37 omitted
 
-def _reduce_38(val, _values, result)
+# reduce 38 omitted
+
+def _reduce_39(val, _values, result)
         if val[0] == 'even'
           val = ["2","n","+","0"]
           result = Node.new(:AN_PLUS_B, val)
@@ -519,7 +525,7 @@ def _reduce_38(val, _values, result)
     result
 end
 
-def _reduce_39(val, _values, result)
+def _reduce_40(val, _values, result)
         if val[1] == 'n'
           result = Node.new(:AN_PLUS_B, val)
         else
@@ -529,7 +535,7 @@ def _reduce_39(val, _values, result)
     result
 end
 
-def _reduce_40(val, _values, result)
+def _reduce_41(val, _values, result)
                # n+3, -n+3
         if val[0] == 'n'
           val.unshift("1")
@@ -545,7 +551,7 @@ def _reduce_40(val, _values, result)
     result
 end
 
-def _reduce_41(val, _values, result)
+def _reduce_42(val, _values, result)
         if val[1] == 'n'
           val << "+"
           val << "0"
@@ -557,26 +563,20 @@ def _reduce_41(val, _values, result)
     result
 end
 
-def _reduce_42(val, _values, result)
+def _reduce_43(val, _values, result)
         result = Node.new(:PSEUDO_CLASS, [val[1]])
       
     result
 end
 
-def _reduce_43(val, _values, result)
+def _reduce_44(val, _values, result)
  result = Node.new(:PSEUDO_CLASS, [val[1]]) 
     result
 end
 
-# reduce 44 omitted
-
 # reduce 45 omitted
 
-def _reduce_46(val, _values, result)
-        result = Node.new(:COMBINATOR, val)
-      
-    result
-end
+# reduce 46 omitted
 
 def _reduce_47(val, _values, result)
         result = Node.new(:COMBINATOR, val)
@@ -596,7 +596,11 @@ def _reduce_49(val, _values, result)
     result
 end
 
-# reduce 50 omitted
+def _reduce_50(val, _values, result)
+        result = Node.new(:COMBINATOR, val)
+      
+    result
+end
 
 # reduce 51 omitted
 
@@ -604,70 +608,72 @@ end
 
 # reduce 53 omitted
 
-def _reduce_54(val, _values, result)
+# reduce 54 omitted
+
+def _reduce_55(val, _values, result)
  result = Node.new(:ID, val) 
     result
 end
 
-def _reduce_55(val, _values, result)
+def _reduce_56(val, _values, result)
  result = [val.first, val[1]] 
     result
 end
 
-def _reduce_56(val, _values, result)
+def _reduce_57(val, _values, result)
  result = [val.first, val[1]] 
     result
 end
 
-# reduce 57 omitted
+# reduce 58 omitted
 
-def _reduce_58(val, _values, result)
+def _reduce_59(val, _values, result)
  result = :equal 
     result
 end
 
-def _reduce_59(val, _values, result)
+def _reduce_60(val, _values, result)
  result = :prefix_match 
     result
 end
 
-def _reduce_60(val, _values, result)
+def _reduce_61(val, _values, result)
  result = :suffix_match 
     result
 end
 
-def _reduce_61(val, _values, result)
+def _reduce_62(val, _values, result)
  result = :substring_match 
     result
 end
 
-def _reduce_62(val, _values, result)
+def _reduce_63(val, _values, result)
  result = :not_equal 
     result
 end
 
-def _reduce_63(val, _values, result)
+def _reduce_64(val, _values, result)
  result = :includes 
     result
 end
 
-def _reduce_64(val, _values, result)
+def _reduce_65(val, _values, result)
  result = :dash_match 
     result
 end
 
-def _reduce_65(val, _values, result)
+def _reduce_66(val, _values, result)
         result = Node.new(:NOT, [val[1]])
       
     result
 end
 
-# reduce 66 omitted
-
 # reduce 67 omitted
 
 # reduce 68 omitted
 
+# reduce 69 omitted
+
 def _reduce_none(val, _values, result)
   val[0]
 end