nokogiri 1.5.3.rc3-java → 1.5.3.rc4-java

data/ext/java/nokogiri/internals/NokogiriHelpers.java

@@ -255,6 +255,7 @@ public class NokogiriHelpers {
      * this for us.
      */
     public static String rubyStringToString(IRubyObject str) {
+        if (str.isNil()) return null;
         //return rubyStringToString(str.convertToString());
         return toJavaString(str.convertToString());
     }

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/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,172 +14,180 @@ module Nokogiri
 ##### State transition tables begin ###
 
 racc_action_table = [
-     5,    59,    28,    23,    12,    25,    63,    60,     5,     1,
-     6,    62,    12,    60,    69,    24,    17,     1,    86,    20,
-    98,    97,     6,    12,     9,    10,    14,    20,    17,    70,
-     6,     5,     9,    10,    14,    12,    17,   -24,    44,     5,
-     1,     6,    44,    12,    10,    64,    65,    17,     1,    68,
-    20,     5,    67,     6,    62,     9,    10,    14,    20,    17,
-    29,     6,    31,     9,    10,    14,    12,    17,    12,    65,
-    20,     1,    87,    12,    88,     9,    66,    12,    12,    61,
-    28,    56,    12,    57,     6,    91,     6,    10,    14,    10,
-    17,     6,    17,    92,    10,     6,     6,    17,    10,    10,
-     6,    17,    17,    10,     5,    44,    17,    72,    75,    28,
-    56,    46,    57,    52,    28,    56,    95,    57,    73,    76,
-    77,    96,    78,    20,    72,    75,    71,    22,     9,    99,
-   -24,   101,    36,    38,    40,    73,    76,    77,   102,    78,
-   nil,   nil,    35,    71,    37,    39,    28,    56,   nil,    57 ]
+     6,    62,     7,    63,    14,    19,    23,    26,    20,     2,
+    71,    14,     6,    63,    85,    17,    14,    22,    25,    28,
+    83,     2,     7,    72,    11,    13,    15,   -26,    20,     7,
+    49,    28,    13,    70,     7,    20,    11,    13,    15,     6,
+    20,    64,    65,    14,    19,    23,    26,    64,     2,    36,
+    59,     6,    60,    67,    17,    14,    22,    25,    28,    90,
+     2,     7,     6,    11,    13,    15,    14,    20,    66,    67,
+    28,     2,    91,     7,    14,    11,    13,    15,    14,    20,
+    69,    28,     6,     2,     7,    68,    11,    13,    15,    14,
+    20,    37,     7,    39,    94,    13,     7,    14,    20,    13,
+    15,    28,    20,     6,    49,    14,    11,     7,    36,    59,
+    13,    60,    53,    20,    14,     7,    36,    59,    13,    60,
+    95,    20,    28,     7,   101,   100,    13,    11,    49,    20,
+    74,    76,     7,    36,    31,    13,    33,    50,    20,    74,
+    76,    75,    77,    79,    98,    80,    32,    99,    42,    73,
+    75,    77,    79,   102,    80,    19,    23,    26,    73,    36,
+    59,   -26,    60,   104,   105,    17,   nil,    22,    25 ]
 
 racc_action_check = [
-     0,    21,     5,     5,     0,     5,    23,    45,     9,     0,
-    15,    23,     9,    21,    30,     5,    15,     9,    45,     0,
-    79,    79,     0,     8,     0,     0,     0,     9,     0,    31,
-     9,    34,     9,     9,     9,    34,     9,    29,     8,    60,
-    34,     8,    42,    60,     8,    25,    25,     8,    60,    28,
-    34,     6,    27,    34,    56,    34,    34,    34,    60,    34,
-     6,    60,     6,    60,    60,    60,    44,    60,    83,    57,
-     6,    44,    58,    19,    59,     6,    26,    18,    13,    22,
-    62,    62,    16,    62,    44,    63,    83,    44,    44,    83,
-    44,    19,    83,    64,    19,    18,    13,    19,    18,    13,
-    16,    18,    13,    16,    17,    11,    16,    32,    32,    20,
-    20,    10,    20,    17,    65,    65,    69,    65,    32,    32,
-    32,    74,    32,    17,    33,    33,    32,     4,    17,    80,
-     1,    85,     7,     7,     7,    33,    33,    33,    92,    33,
-   nil,   nil,     7,    33,     7,     7,    68,    68,   nil,    68 ]
+     0,    29,    21,    45,     0,     0,     0,     0,    21,     0,
+    38,    24,    63,    29,    45,     0,    63,     0,     0,     0,
+    42,    63,     0,    39,     0,     0,     0,    37,     0,    24,
+    47,    63,    24,    36,    63,    24,    63,    63,    63,    11,
+    63,    59,    31,    11,    11,    11,    11,    31,    11,    70,
+    70,     9,    70,    60,    11,     9,    11,    11,    11,    61,
+     9,    11,    44,    11,    11,    11,    44,    11,    33,    33,
+     9,    44,    62,     9,    87,     9,     9,     9,    49,     9,
+    35,    44,     7,    49,    44,    34,    44,    44,    44,    12,
+    44,     7,    87,     7,    65,    87,    49,    27,    87,    49,
+    49,     7,    49,    20,    12,    18,     7,    12,    64,    64,
+    12,    64,    20,    12,     1,    27,    28,    28,    27,    28,
+    66,    27,    20,    18,    81,    81,    18,    20,    16,    18,
+    41,    41,     1,     6,     6,     1,     6,    13,     1,    40,
+    40,    41,    41,    41,    71,    41,     6,    78,     8,    41,
+    40,    40,    40,    82,    40,    10,    10,    10,    40,    67,
+    67,     2,    67,    89,    95,    10,   nil,    10,    10 ]
 
 racc_action_pointer = [
-    -2,   101,   nil,   nil,    98,    -8,    49,   125,    17,     6,
-   100,    84,   nil,    72,   nil,   -14,    76,   102,    71,    67,
-    99,     1,    68,    -1,   nil,    34,    53,    29,    37,     8,
-   -15,     4,   104,   121,    29,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    21,   nil,    60,    -5,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    42,    57,    49,    74,
-    37,   nil,    70,    72,    86,   104,   nil,   nil,   136,   105,
-   nil,   nil,   nil,   nil,    96,   nil,   nil,   nil,   nil,    10,
-   104,   nil,   nil,    62,   nil,   108,   nil,   nil,   nil,   nil,
-   nil,   nil,   125,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil ]
+    -2,   108,   132,   nil,   nil,   nil,   123,    80,   119,    49,
+   148,    37,    83,   126,   nil,   nil,   107,   nil,    99,   nil,
+   101,   -22,   nil,   nil,     5,   nil,   nil,    91,   106,     1,
+   nil,    35,   nil,    57,    62,    57,    21,    -2,   -19,    -2,
+   136,   127,     9,   nil,    60,    -9,   nil,     9,   nil,    72,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    29,
+    41,    36,    72,    10,    98,    81,   113,   149,   nil,   nil,
+    39,   133,   nil,   nil,   nil,   nil,   nil,   nil,   122,   nil,
+   nil,   114,   128,   nil,   nil,   nil,   nil,    68,   nil,   140,
+   nil,   nil,   nil,   nil,   nil,   151,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil ]
 
 racc_action_default = [
-   -25,   -23,   -20,    -2,   -72,   -72,   -25,   -18,   -48,   -25,
-   -72,   -16,   -57,   -53,   -21,   -12,   -56,   -72,   -55,   -54,
-   -72,   -72,   -72,   -41,   -31,   -39,   -72,   -72,   -40,   -30,
-   -72,   -72,   -60,   -60,   -25,    -5,    -3,    -8,    -4,    -7,
-    -6,    -9,   -47,   -11,   -25,   -72,   -19,   -15,   -49,   -13,
-   -14,   -52,   -46,   -45,   -51,   -50,   -41,   -39,   -72,   -72,
-   -25,   -22,   -72,   -72,   -44,   -72,   -32,   -33,   -72,   -72,
-   -28,   -61,   -66,   -62,   -72,   -67,   -63,   -64,   -65,   -72,
-   -72,   -17,   -10,   -69,   -71,   -72,   -35,   -34,   103,    -1,
-   -38,   -43,   -72,   -36,   -37,   -29,   -26,   -58,   -59,   -27,
-   -70,   -68,   -42 ]
+   -27,   -56,   -25,    -3,   -22,    -2,   -74,   -27,   -74,   -27,
+   -20,   -27,   -50,   -74,   -59,   -23,   -17,    -6,   -55,    -4,
+   -74,   -13,    -9,    -5,   -58,    -8,    -7,   -57,   -74,   -74,
+   -52,   -43,   -33,   -41,   -74,   -74,   -42,   -32,   -74,   -74,
+   -62,   -62,   -74,   -18,   -27,   -74,   -10,   -49,   -12,   -27,
+   -21,   -16,   -51,   -48,   -47,   -14,   -15,   -54,   -53,   -43,
+   -41,   -74,   -74,   -27,   -74,   -74,   -46,   -74,   -34,   -35,
+   -74,   -74,   -30,   -63,   -68,   -64,   -69,   -65,   -74,   -66,
+   -67,   -74,   -74,   -24,   -19,   -37,   -11,   -71,   -73,   -74,
+   -36,   106,    -1,   -40,   -45,   -74,   -38,   -39,   -31,   -28,
+   -60,   -61,   -29,   -72,   -70,   -44 ]
 
 racc_goto_table = [
-    42,    26,    81,    43,    33,    48,    47,    49,    51,    21,
-    54,    55,    74,    80,    41,    53,    58,    50,    45,    30,
-    32,    83,    34,    27,    85,   nil,   nil,   nil,    89,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    84,    82,   nil,   nil,
+    30,    43,    34,    48,    29,    41,    55,    51,    78,    82,
+    46,    47,    56,    38,    40,    45,    87,    52,    54,    44,
+    35,    89,   nil,    57,    61,   nil,    58,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    84,   nil,    86,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    88,   nil,
+   nil,   nil,   nil,   nil,   nil,    92,   nil,   nil,   nil,   nil,
+    93,   nil,   nil,    96,   nil,   nil,    97,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    90,   nil,
-   nil,    93,   nil,   nil,    94,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   100 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   103 ]
 
 racc_goto_check = [
-     7,    17,     2,     8,     9,     7,     8,    10,     7,     1,
-     7,     7,    16,    16,     6,     9,    17,    11,     1,    14,
-    15,     5,     3,    18,    21,   nil,   nil,   nil,     2,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,     7,     8,   nil,   nil,
+     8,     2,    18,     9,     1,    10,    11,     9,    17,    17,
+     7,     8,    12,    15,    16,     1,     6,     8,    10,     4,
+    19,    22,   nil,     8,    18,   nil,     8,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,     2,   nil,     9,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     8,   nil,
+   nil,   nil,   nil,   nil,   nil,     2,   nil,   nil,   nil,   nil,
+    18,   nil,   nil,    18,   nil,   nil,    18,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    17,   nil,
-   nil,    17,   nil,   nil,    17,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,     7 ]
+   nil,   nil,   nil,   nil,   nil,   nil,     8 ]
 
 racc_goto_pointer = [
-   nil,     9,   -32,    15,   nil,   -23,     6,    -8,    -5,    -2,
-    -8,     2,   nil,   nil,    13,    14,   -20,    -4,    18,   nil,
-   nil,   -20 ]
+   nil,     4,    -8,   nil,     9,   nil,   -33,    -2,    -1,    -9,
+    -2,   -15,    -9,   nil,   nil,     6,     7,   -32,    -4,    14,
+   nil,   nil,   -28 ]
 
 racc_goto_default = [
-   nil,   nil,     3,   nil,     7,     8,   nil,    11,   nil,    15,
-    16,    18,    19,     2,     4,   nil,   nil,   nil,   nil,    13,
-    79,   nil ]
+   nil,   nil,     3,     5,     9,    10,    12,   nil,    16,   nil,
+    21,    24,    27,     1,     4,     8,   nil,   nil,   nil,   nil,
+    18,    81,   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,
-  3, 46, :_reduce_29,
-  1, 46, :_reduce_30,
-  2, 40, :_reduce_31,
-  3, 40, :_reduce_32,
-  3, 40, :_reduce_33,
-  3, 40, :_reduce_34,
-  3, 40, :_reduce_35,
-  3, 48, :_reduce_36,
-  3, 48, :_reduce_37,
-  3, 48, :_reduce_38,
-  1, 48, :_reduce_none,
-  1, 48, :_reduce_none,
-  1, 48, :_reduce_41,
-  4, 49, :_reduce_42,
-  3, 49, :_reduce_43,
-  2, 49, :_reduce_44,
-  2, 41, :_reduce_45,
-  2, 41, :_reduce_46,
+  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_49,
-  2, 38, :_reduce_50,
-  2, 38, :_reduce_51,
-  2, 38, :_reduce_52,
-  1, 38, :_reduce_none,
-  1, 38, :_reduce_none,
+  1, 37, :_reduce_23,
+  3, 45, :_reduce_24,
+  1, 45, :_reduce_25,
+  1, 46, :_reduce_26,
+  0, 46, :_reduce_none,
+  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,
-  1, 38, :_reduce_none,
-  1, 50, :_reduce_57,
-  2, 47, :_reduce_58,
-  2, 47, :_reduce_59,
-  0, 47, :_reduce_none,
-  1, 51, :_reduce_61,
-  1, 51, :_reduce_62,
-  1, 51, :_reduce_63,
-  1, 51, :_reduce_64,
-  1, 51, :_reduce_65,
-  1, 51, :_reduce_66,
-  1, 51, :_reduce_67,
-  3, 39, :_reduce_68,
-  1, 52, :_reduce_none,
-  2, 52, :_reduce_none,
-  1, 52, :_reduce_none ]
-
-racc_reduce_n = 72
-
-racc_shift_n = 103
+  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,
@@ -269,6 +277,7 @@ Racc_token_to_s_table = [
   "$start",
   "selector",
   "simple_selector_1toN",
+  "prefixless_combinator_selector",
   "combinator",
   "simple_selector",
   "element_name",
@@ -307,22 +316,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
 
@@ -332,11 +341,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
@@ -346,7 +360,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,
@@ -357,27 +371,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, ['*']),
@@ -388,7 +402,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]
         )
@@ -396,27 +410,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(':')]
         )
@@ -424,21 +444,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] || [])
         )
@@ -446,7 +466,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] || [])
         )
@@ -454,7 +474,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]])]
@@ -463,7 +483,7 @@ 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(':')]
         )
@@ -471,7 +491,7 @@ def _reduce_29(val, _values, result)
     result
 end
 
-def _reduce_30(val, _values, result)
+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])
@@ -479,56 +499,56 @@ def _reduce_30(val, _values, result)
     result
 end
 
-def _reduce_31(val, _values, result)
+def _reduce_33(val, _values, result)
         result = Node.new(:FUNCTION, [val.first.strip])
       
     result
 end
 
-def _reduce_32(val, _values, result)
+def _reduce_34(val, _values, result)
         result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
       
     result
 end
 
-def _reduce_33(val, _values, result)
+def _reduce_35(val, _values, result)
         result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
       
     result
 end
 
-def _reduce_34(val, _values, result)
+def _reduce_36(val, _values, result)
         result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
       
     result
 end
 
-def _reduce_35(val, _values, result)
+def _reduce_37(val, _values, result)
         result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
       
     result
 end
 
-def _reduce_36(val, _values, result)
+def _reduce_38(val, _values, result)
  result = [val.first, val.last] 
     result
 end
 
-def _reduce_37(val, _values, result)
+def _reduce_39(val, _values, result)
  result = [val.first, val.last] 
     result
 end
 
-def _reduce_38(val, _values, result)
+def _reduce_40(val, _values, result)
  result = [val.first, val.last] 
     result
 end
 
-# reduce 39 omitted
+# reduce 41 omitted
 
-# reduce 40 omitted
+# reduce 42 omitted
 
-def _reduce_41(val, _values, result)
+def _reduce_43(val, _values, result)
         if val[0] == 'even'
           val = ["2","n","+","0"]
           result = Node.new(:AN_PLUS_B, val)
@@ -546,7 +566,7 @@ def _reduce_41(val, _values, result)
     result
 end
 
-def _reduce_42(val, _values, result)
+def _reduce_44(val, _values, result)
         if val[1] == 'n'
           result = Node.new(:AN_PLUS_B, val)
         else
@@ -556,7 +576,7 @@ def _reduce_42(val, _values, result)
     result
 end
 
-def _reduce_43(val, _values, result)
+def _reduce_45(val, _values, result)
                # n+3, -n+3
         if val[0] == 'n'
           val.unshift("1")
@@ -572,7 +592,7 @@ def _reduce_43(val, _values, result)
     result
 end
 
-def _reduce_44(val, _values, result)
+def _reduce_46(val, _values, result)
         if val[1] == 'n'
           val << "+"
           val << "0"
@@ -584,116 +604,116 @@ def _reduce_44(val, _values, result)
     result
 end
 
-def _reduce_45(val, _values, result)
+def _reduce_47(val, _values, result)
         result = Node.new(:PSEUDO_CLASS, [val[1]])
       
     result
 end
 
-def _reduce_46(val, _values, result)
+def _reduce_48(val, _values, result)
  result = Node.new(:PSEUDO_CLASS, [val[1]]) 
     result
 end
 
-# reduce 47 omitted
+# reduce 49 omitted
 
-# reduce 48 omitted
+# reduce 50 omitted
 
-def _reduce_49(val, _values, result)
+def _reduce_51(val, _values, result)
         result = Node.new(:COMBINATOR, val)
       
     result
 end
 
-def _reduce_50(val, _values, result)
+def _reduce_52(val, _values, result)
         result = Node.new(:COMBINATOR, val)
       
     result
 end
 
-def _reduce_51(val, _values, result)
+def _reduce_53(val, _values, result)
         result = Node.new(:COMBINATOR, val)
       
     result
 end
 
-def _reduce_52(val, _values, result)
+def _reduce_54(val, _values, result)
         result = Node.new(:COMBINATOR, val)
       
     result
 end
 
-# reduce 53 omitted
-
-# reduce 54 omitted
-
 # reduce 55 omitted
 
 # reduce 56 omitted
 
-def _reduce_57(val, _values, result)
+# reduce 57 omitted
+
+# reduce 58 omitted
+
+def _reduce_59(val, _values, result)
  result = Node.new(:ID, val) 
     result
 end
 
-def _reduce_58(val, _values, result)
+def _reduce_60(val, _values, result)
  result = [val.first, val[1]] 
     result
 end
 
-def _reduce_59(val, _values, result)
+def _reduce_61(val, _values, result)
  result = [val.first, val[1]] 
     result
 end
 
-# reduce 60 omitted
+# reduce 62 omitted
 
-def _reduce_61(val, _values, result)
+def _reduce_63(val, _values, result)
  result = :equal 
     result
 end
 
-def _reduce_62(val, _values, result)
+def _reduce_64(val, _values, result)
  result = :prefix_match 
     result
 end
 
-def _reduce_63(val, _values, result)
+def _reduce_65(val, _values, result)
  result = :suffix_match 
     result
 end
 
-def _reduce_64(val, _values, result)
+def _reduce_66(val, _values, result)
  result = :substring_match 
     result
 end
 
-def _reduce_65(val, _values, result)
+def _reduce_67(val, _values, result)
  result = :not_equal 
     result
 end
 
-def _reduce_66(val, _values, result)
+def _reduce_68(val, _values, result)
  result = :includes 
     result
 end
 
-def _reduce_67(val, _values, result)
+def _reduce_69(val, _values, result)
  result = :dash_match 
     result
 end
 
-def _reduce_68(val, _values, result)
+def _reduce_70(val, _values, result)
         result = Node.new(:NOT, [val[1]])
       
     result
 end
 
-# reduce 69 omitted
+# reduce 71 omitted
 
-# reduce 70 omitted
+# reduce 72 omitted
 
-# reduce 71 omitted
+# reduce 73 omitted
 
 def _reduce_none(val, _values, result)
   val[0]