nokogiri 1.5.10 → 1.10.4

data/lib/nokogiri/css/parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.8
+# This file is automatically generated by Racc 1.4.14
 # from Racc grammer file "".
 #
 
@@ -8,182 +8,212 @@ require 'racc/parser.rb'
 
 
 require 'nokogiri/css/parser_extras'
+
 module Nokogiri
   module CSS
     class Parser < Racc::Parser
+
+
+def unescape_css_identifier(identifier)
+  identifier.gsub(/\\(?:([^0-9a-fA-F])|([0-9a-fA-F]{1,6})\s?)/){ |m| $1 || [$2.hex].pack('U') }
+end
+
+def unescape_css_string(str)
+  str.gsub(/\\(?:([^0-9a-fA-F])|([0-9a-fA-F]{1,6})\s?)/) do |m|
+    if $1=="\n"
+      ''
+    else
+      $1 || [$2.hex].pack('U')
+    end
+  end
+end
 ##### State transition tables begin ###
 
 racc_action_table = [
-    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 ]
+    24,    93,    56,    57,    33,    55,    94,    23,    24,    22,
+    12,    93,    33,    27,    35,    52,    44,    22,   -23,    25,
+    45,    98,    23,    33,    26,    18,    20,    25,    27,   -23,
+    23,    24,    26,    18,    20,    33,    27,    11,    39,    24,
+    22,    23,    74,    33,    18,    91,    90,    27,    22,    12,
+    25,    24,   -23,    23,    85,    26,    18,    20,    25,    27,
+    66,    23,    24,    26,    18,    20,    33,    27,    86,    88,
+    51,    22,    89,    92,    24,    26,    56,    87,    95,    60,
+    90,    25,    96,    46,    23,    49,    26,    18,    20,    99,
+    27,    33,    33,    51,   103,   104,    56,    58,    26,    60,
+    93,   106,    33,    33,    33,   109,    39,    39,   110,    23,
+    23,   nil,    18,    18,    20,    27,    27,    39,    39,    39,
+    23,    23,    23,    18,    18,    18,    27,    27,    27,    33,
+    33,   101,   100,   nil,   102,    22,    56,    87,   nil,    60,
+    33,   nil,   nil,   nil,    39,    39,   nil,    23,    23,   nil,
+    18,    18,    20,    27,    27,    39,    82,    83,    23,    56,
+    87,    18,    60,   nil,    27,    82,    83,    78,    79,    80,
+   nil,    81,   nil,   nil,   nil,    77,    78,    79,    80,   nil,
+    81,     4,     5,    10,    77,     4,     5,    43,   nil,    56,
+    87,     6,    60,     8,     7,     6,   nil,     8,     7,     4,
+     5,    10,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     6,
+   nil,     8,     7 ]
 
 racc_action_check = [
-     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 ]
+     3,    58,    24,    24,     3,    24,    57,    15,     9,     3,
+    64,    57,     9,    15,    11,    24,    18,     9,    58,     3,
+    21,    64,     3,    14,     3,     3,     3,     9,     3,    22,
+     9,    12,     9,     9,     9,    12,     9,     1,    14,    42,
+    12,    14,    45,    42,    14,    55,    55,    14,    42,     1,
+    12,    27,    46,    12,    49,    12,    12,    12,    42,    12,
+    27,    42,    43,    42,    42,    42,    43,    42,    50,    53,
+    27,    43,    54,    56,    23,    27,    51,    51,    59,    51,
+    60,    43,    61,    23,    43,    23,    43,    43,    43,    75,
+    43,    28,    25,    23,    84,    86,    25,    25,    23,    25,
+    87,    91,    29,    30,    31,    94,    28,    25,   106,    28,
+    25,   nil,    28,    25,    25,    28,    25,    29,    30,    31,
+    29,    30,    31,    29,    30,    31,    29,    30,    31,    32,
+    39,    76,    76,   nil,    76,    39,    90,    90,   nil,    90,
+    62,   nil,   nil,   nil,    32,    39,   nil,    32,    39,   nil,
+    32,    39,    39,    32,    39,    62,    47,    47,    62,    92,
+    92,    62,    92,   nil,    62,    48,    48,    47,    47,    47,
+   nil,    47,   nil,   nil,   nil,    47,    48,    48,    48,   nil,
+    48,     0,     0,     0,    48,    17,    17,    17,   nil,    93,
+    93,     0,    93,     0,     0,    17,   nil,    17,    17,    26,
+    26,    26,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    26,
+   nil,    26,    26 ]
 
 racc_action_pointer = [
-    -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 ]
+   174,    37,   nil,    -2,   nil,   nil,   nil,   nil,   nil,     6,
+   nil,    14,    29,   nil,    17,   -17,   nil,   178,     5,   nil,
+   nil,    -9,     0,    72,    -8,    86,   192,    49,    85,    96,
+    97,    98,   123,   nil,   nil,   nil,   nil,   nil,   nil,   124,
+   nil,   nil,    37,    60,   nil,    31,    23,   153,   162,    29,
+    39,    66,   nil,    46,    49,    34,    61,    -1,   -11,    55,
+    68,    59,   134,   nil,    -2,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    64,   121,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    69,   nil,    84,    88,   nil,   nil,
+   126,    94,   149,   179,    92,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    95,   nil,   nil,   nil,
+   nil ]
 
 racc_action_default = [
-   -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 ]
+   -75,   -76,    -2,   -24,    -4,    -5,    -6,    -7,    -8,   -24,
+   -74,   -76,   -24,    -3,   -47,   -10,   -13,   -17,   -76,   -19,
+   -20,   -76,   -22,   -24,   -76,   -24,   -75,   -76,   -53,   -54,
+   -55,   -56,   -57,   -58,   -14,   111,    -1,    -9,   -46,   -24,
+   -11,   -12,   -24,   -24,   -18,   -76,   -29,   -62,   -62,   -76,
+   -76,   -76,   -30,   -76,   -76,   -38,   -39,   -40,   -22,   -76,
+   -38,   -76,   -71,   -73,   -76,   -44,   -45,   -48,   -49,   -50,
+   -51,   -52,   -15,   -16,   -21,   -76,   -76,   -63,   -64,   -65,
+   -66,   -67,   -68,   -69,   -76,   -27,   -76,   -40,   -31,   -32,
+   -76,   -43,   -76,   -76,   -76,   -33,   -70,   -72,   -34,   -25,
+   -59,   -60,   -61,   -26,   -28,   -35,   -76,   -36,   -37,   -42,
+   -41 ]
 
 racc_goto_table = [
-    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,
+    53,    38,    13,     1,    42,    48,    62,    37,    34,    65,
+    40,    36,    63,    75,    84,    67,    68,    69,    70,    71,
+    62,    41,    50,    47,    54,   nil,    63,   nil,   nil,    64,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    72,    73,   nil,   nil,   nil,   nil,   nil,   nil,    97,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    94,   nil,   nil,   nil,   nil,   100,   nil,   102,   103 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   105,   nil,   107,   108 ]
 
 racc_goto_check = [
-    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,
+    18,    12,     2,     1,     5,     9,     7,     8,     2,     9,
+    10,     2,    12,    17,    17,    12,    12,    12,    12,    12,
+     7,    11,    15,    16,    19,   nil,    12,   nil,   nil,     1,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,     2,     2,   nil,   nil,   nil,   nil,   nil,   nil,    12,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-     8,   nil,   nil,   nil,   nil,    18,   nil,    18,    18 ]
+   nil,   nil,   nil,   nil,   nil,   nil,    18,   nil,    18,    18 ]
 
 racc_goto_pointer = [
-   nil,     5,   -10,   nil,     8,   nil,   -19,     2,    -8,    -4,
-   -13,    -7,     2,   nil,   nil,    -6,    -5,   -35,   -21,     2,
-   nil,   nil,   -11 ]
+   nil,     3,    -1,   nil,   nil,   -13,   nil,   -19,    -7,   -18,
+    -5,     6,   -13,   nil,   nil,    -1,     0,   -34,   -24,     0,
+   nil,   nil,   nil,   nil ]
 
 racc_goto_default = [
-   nil,   nil,     3,     2,    13,    14,    10,   nil,    12,   nil,
-    11,    28,    27,    26,    16,    18,   nil,   nil,   nil,   nil,
-    25,    73,   nil ]
+   nil,   nil,   nil,     2,     3,     9,    17,    14,   nil,    15,
+    31,    30,    16,    29,    19,    21,   nil,   nil,    59,   nil,
+    28,    32,    76,    61 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
   3, 32, :_reduce_1,
   1, 32, :_reduce_2,
-  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,
-  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,
+  2, 32, :_reduce_3,
+  1, 36, :_reduce_4,
+  1, 36, :_reduce_5,
+  1, 36, :_reduce_6,
+  1, 36, :_reduce_7,
+  1, 36, :_reduce_8,
+  2, 37, :_reduce_9,
   1, 37, :_reduce_none,
-  1, 37, :_reduce_23,
-  3, 45, :_reduce_24,
-  1, 45, :_reduce_25,
-  1, 46, :_reduce_26,
+  2, 37, :_reduce_11,
+  2, 37, :_reduce_12,
+  1, 37, :_reduce_13,
+  2, 34, :_reduce_14,
+  3, 33, :_reduce_15,
+  3, 33, :_reduce_16,
+  1, 33, :_reduce_none,
+  2, 44, :_reduce_18,
+  1, 38, :_reduce_none,
+  1, 38, :_reduce_20,
+  3, 45, :_reduce_21,
+  1, 45, :_reduce_22,
+  1, 46, :_reduce_23,
   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,
+  4, 42, :_reduce_25,
+  4, 42, :_reduce_26,
+  3, 42, :_reduce_27,
+  3, 47, :_reduce_28,
+  1, 47, :_reduce_29,
+  2, 40, :_reduce_30,
+  3, 40, :_reduce_31,
+  3, 40, :_reduce_32,
+  3, 40, :_reduce_33,
+  3, 40, :_reduce_34,
+  3, 49, :_reduce_35,
+  3, 49, :_reduce_36,
+  3, 49, :_reduce_37,
   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, 49, :_reduce_40,
+  4, 50, :_reduce_41,
+  3, 50, :_reduce_42,
+  2, 50, :_reduce_43,
+  2, 41, :_reduce_44,
+  2, 41, :_reduce_45,
   1, 39, :_reduce_none,
-  1, 39, :_reduce_none,
-  1, 39, :_reduce_none,
-  1, 51, :_reduce_59,
+  0, 39, :_reduce_none,
+  2, 43, :_reduce_48,
+  2, 43, :_reduce_49,
+  2, 43, :_reduce_50,
+  2, 43, :_reduce_51,
+  2, 43, :_reduce_52,
+  1, 43, :_reduce_none,
+  1, 43, :_reduce_none,
+  1, 43, :_reduce_none,
+  1, 43, :_reduce_none,
+  1, 43, :_reduce_none,
+  1, 51, :_reduce_58,
+  2, 48, :_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
+  1, 53, :_reduce_63,
+  1, 53, :_reduce_64,
+  1, 53, :_reduce_65,
+  1, 53, :_reduce_66,
+  1, 53, :_reduce_67,
+  1, 53, :_reduce_68,
+  1, 53, :_reduce_69,
+  3, 52, :_reduce_70,
+  1, 54, :_reduce_none,
+  2, 54, :_reduce_none,
+  1, 54, :_reduce_none,
+  1, 35, :_reduce_none,
+  0, 35, :_reduce_none ]
+
+racc_reduce_n = 76
+
+racc_shift_n = 111
 
 racc_token_table = {
   false => 0,
@@ -274,23 +304,24 @@ Racc_token_to_s_table = [
   "selector",
   "simple_selector_1toN",
   "prefixless_combinator_selector",
+  "optional_S",
   "combinator",
   "simple_selector",
   "element_name",
   "hcap_0toN",
-  "hcap_1toN",
-  "negation",
   "function",
   "pseudo",
   "attrib",
+  "hcap_1toN",
   "class",
   "namespaced_ident",
   "namespace",
   "attrib_name",
   "attrib_val_0or1",
   "expr",
-  "an_plus_b",
+  "nth",
   "attribute_id",
+  "negation",
   "eql_incl_dash",
   "negation_arg" ]
 
@@ -312,7 +343,7 @@ def _reduce_2(val, _values, result)
 end
 
 def _reduce_3(val, _values, result)
- result = val.flatten 
+ result = [val.last].flatten 
     result
 end
 
@@ -337,16 +368,11 @@ def _reduce_7(val, _values, result)
 end
 
 def _reduce_8(val, _values, result)
- result = :DESCENDANT_SELECTOR 
-    result
-end
-
-def _reduce_9(val, _values, result)
  result = :CHILD_SELECTOR 
     result
 end
 
-def _reduce_10(val, _values, result)
+def _reduce_9(val, _values, result)
         result =  if val[1].nil?
                     val.first
                   else
@@ -356,83 +382,61 @@ def _reduce_10(val, _values, result)
     result
 end
 
-def _reduce_11(val, _values, result)
-        result = Node.new(:CONDITIONAL_SELECTOR,
-          [
-            val.first,
-            Node.new(:COMBINATOR, [val[1], val.last])
-          ]
-        )
-      
-    result
-end
-
-def _reduce_12(val, _values, result)
-        result = Node.new(:CONDITIONAL_SELECTOR, val)
-      
-    result
-end
-
-# reduce 13 omitted
+# reduce 10 omitted
 
-def _reduce_14(val, _values, result)
+def _reduce_11(val, _values, result)
         result = Node.new(:CONDITIONAL_SELECTOR, val)
       
     result
 end
 
-def _reduce_15(val, _values, result)
+def _reduce_12(val, _values, result)
         result = Node.new(:CONDITIONAL_SELECTOR, val)
       
     result
 end
 
-def _reduce_16(val, _values, result)
+def _reduce_13(val, _values, result)
         result = Node.new(:CONDITIONAL_SELECTOR,
-          [
-            Node.new(:ELEMENT_NAME, ['*']),
-            Node.new(:COMBINATOR, val)
-          ]
+          [Node.new(:ELEMENT_NAME, ['*']), val.first]
         )
       
     result
 end
 
-def _reduce_17(val, _values, result)
-        result = Node.new(:CONDITIONAL_SELECTOR,
-          [Node.new(:ELEMENT_NAME, ['*']), val.first]
-        )
+def _reduce_14(val, _values, result)
+        result = Node.new(val.first, [nil, val.last])
       
     result
 end
 
-def _reduce_18(val, _values, result)
-        result = Node.new(val.first, [nil, val.last])
+def _reduce_15(val, _values, result)
+        result = Node.new(val[1], [val.first, val.last])
       
     result
 end
 
-def _reduce_19(val, _values, result)
-        result = Node.new(val[1], [val.first, val.last])
+def _reduce_16(val, _values, result)
+        result = Node.new(:DESCENDANT_SELECTOR, [val.first, val.last])
       
     result
 end
 
-# reduce 20 omitted
+# reduce 17 omitted
 
-def _reduce_21(val, _values, result)
- result = Node.new(:CLASS_CONDITION, [val[1]]) 
+def _reduce_18(val, _values, result)
+ result = Node.new(:CLASS_CONDITION, [unescape_css_identifier(val[1])]) 
     result
 end
 
-# reduce 22 omitted
+# reduce 19 omitted
 
-def _reduce_23(val, _values, result)
+def _reduce_20(val, _values, result)
  result = Node.new(:ELEMENT_NAME, val) 
     result
 end
 
-def _reduce_24(val, _values, result)
+def _reduce_21(val, _values, result)
         result = Node.new(:ELEMENT_NAME,
           [[val.first, val.last].compact.join(':')]
         )
@@ -440,21 +444,21 @@ def _reduce_24(val, _values, result)
     result
 end
 
-def _reduce_25(val, _values, result)
+def _reduce_22(val, _values, result)
         name = @namespaces.key?('xmlns') ? "xmlns:#{val.first}" : val.first
         result = Node.new(:ELEMENT_NAME, [name])
       
     result
 end
 
-def _reduce_26(val, _values, result)
+def _reduce_23(val, _values, result)
  result = val[0] 
     result
 end
 
-# reduce 27 omitted
+# reduce 24 omitted
 
-def _reduce_28(val, _values, result)
+def _reduce_25(val, _values, result)
         result = Node.new(:ATTRIBUTE_CONDITION,
           [val[1]] + (val[2] || [])
         )
@@ -462,7 +466,7 @@ def _reduce_28(val, _values, result)
     result
 end
 
-def _reduce_29(val, _values, result)
+def _reduce_26(val, _values, result)
         result = Node.new(:ATTRIBUTE_CONDITION,
           [val[1]] + (val[2] || [])
         )
@@ -470,7 +474,7 @@ def _reduce_29(val, _values, result)
     result
 end
 
-def _reduce_30(val, _values, result)
+def _reduce_27(val, _values, result)
         # Non standard, but hpricot supports it.
         result = Node.new(:PSEUDO_CLASS,
           [Node.new(:FUNCTION, ['nth-child(', val[1]])]
@@ -479,7 +483,7 @@ def _reduce_30(val, _values, result)
     result
 end
 
-def _reduce_31(val, _values, result)
+def _reduce_28(val, _values, result)
         result = Node.new(:ELEMENT_NAME,
           [[val.first, val.last].compact.join(':')]
         )
@@ -487,7 +491,7 @@ def _reduce_31(val, _values, result)
     result
 end
 
-def _reduce_32(val, _values, result)
+def _reduce_29(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])
@@ -495,62 +499,63 @@ def _reduce_32(val, _values, result)
     result
 end
 
-def _reduce_33(val, _values, result)
+def _reduce_30(val, _values, result)
         result = Node.new(:FUNCTION, [val.first.strip])
       
     result
 end
 
-def _reduce_34(val, _values, result)
+def _reduce_31(val, _values, result)
         result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
       
     result
 end
 
-def _reduce_35(val, _values, result)
+def _reduce_32(val, _values, result)
         result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
       
     result
 end
 
-def _reduce_36(val, _values, result)
+def _reduce_33(val, _values, result)
         result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
       
     result
 end
 
-def _reduce_37(val, _values, result)
+def _reduce_34(val, _values, result)
         result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
       
     result
 end
 
-def _reduce_38(val, _values, result)
+def _reduce_35(val, _values, result)
  result = [val.first, val.last] 
     result
 end
 
-def _reduce_39(val, _values, result)
+def _reduce_36(val, _values, result)
  result = [val.first, val.last] 
     result
 end
 
-def _reduce_40(val, _values, result)
+def _reduce_37(val, _values, result)
  result = [val.first, val.last] 
     result
 end
 
-# reduce 41 omitted
+# reduce 38 omitted
 
-# reduce 42 omitted
+# reduce 39 omitted
 
-def _reduce_43(val, _values, result)
-        if val[0] == 'even'
-          val = ["2","n","+","0"]
-          result = Node.new(:AN_PLUS_B, val)
-        elsif val[0] == 'odd'
-          val = ["2","n","+","1"]
-          result = Node.new(:AN_PLUS_B, val)
+def _reduce_40(val, _values, result)
+        case val[0]
+        when 'even'
+          result = Node.new(:NTH, ['2','n','+','0'])
+        when 'odd'
+          result = Node.new(:NTH, ['2','n','+','1'])
+        when 'n'
+          result = Node.new(:NTH, ['1','n','+','0'])
         else
           # This is not CSS standard.  It allows us to support this:
           # assert_xpath("//a[foo(., @href)]", @parser.parse('a:foo(@href)'))
@@ -562,9 +567,9 @@ def _reduce_43(val, _values, result)
     result
 end
 
-def _reduce_44(val, _values, result)
+def _reduce_41(val, _values, result)
         if val[1] == 'n'
-          result = Node.new(:AN_PLUS_B, val)
+          result = Node.new(:NTH, val)
         else
           raise Racc::ParseError, "parse error on IDENT '#{val[1]}'"
         end
@@ -572,15 +577,15 @@ def _reduce_44(val, _values, result)
     result
 end
 
-def _reduce_45(val, _values, result)
+def _reduce_42(val, _values, result)
                # n+3, -n+3
         if val[0] == 'n'
           val.unshift("1")
-          result = Node.new(:AN_PLUS_B, val)
+          result = Node.new(:NTH, val)
         elsif val[0] == '-n'
           val[0] = 'n'
           val.unshift("-1")
-          result = Node.new(:AN_PLUS_B, val)
+          result = Node.new(:NTH, val)
         else
           raise Racc::ParseError, "parse error on IDENT '#{val[1]}'"
         end
@@ -588,11 +593,19 @@ def _reduce_45(val, _values, result)
     result
 end
 
-def _reduce_46(val, _values, result)
-        if val[1] == 'n'
+def _reduce_43(val, _values, result)
+                    # 5n, -5n, 10n-1
+        n = val[1]
+        if n[0, 2] == 'n-'
+          val[1] = 'n'
+          val << "-"
+          # b is contained in n as n is the string "n-b"
+          val << n[2, n.size]
+          result = Node.new(:NTH, val)
+        elsif n == 'n'
           val << "+"
           val << "0"
-          result = Node.new(:AN_PLUS_B, val)
+          result = Node.new(:NTH, val)
         else
           raise Racc::ParseError, "parse error on IDENT '#{val[1]}'"
         end
@@ -600,60 +613,73 @@ def _reduce_46(val, _values, result)
     result
 end
 
-def _reduce_47(val, _values, result)
+def _reduce_44(val, _values, result)
         result = Node.new(:PSEUDO_CLASS, [val[1]])
       
     result
 end
 
-def _reduce_48(val, _values, result)
+def _reduce_45(val, _values, result)
  result = Node.new(:PSEUDO_CLASS, [val[1]]) 
     result
 end
 
-# reduce 49 omitted
+# reduce 46 omitted
 
-# reduce 50 omitted
+# reduce 47 omitted
 
-def _reduce_51(val, _values, result)
+def _reduce_48(val, _values, result)
         result = Node.new(:COMBINATOR, val)
       
     result
 end
 
-def _reduce_52(val, _values, result)
+def _reduce_49(val, _values, result)
         result = Node.new(:COMBINATOR, val)
       
     result
 end
 
-def _reduce_53(val, _values, result)
+def _reduce_50(val, _values, result)
         result = Node.new(:COMBINATOR, val)
       
     result
 end
 
-def _reduce_54(val, _values, result)
+def _reduce_51(val, _values, result)
         result = Node.new(:COMBINATOR, val)
       
     result
 end
 
+def _reduce_52(val, _values, result)
+        result = Node.new(:COMBINATOR, val)
+      
+    result
+end
+
+# reduce 53 omitted
+
+# reduce 54 omitted
+
 # reduce 55 omitted
 
 # reduce 56 omitted
 
 # reduce 57 omitted
 
-# reduce 58 omitted
+def _reduce_58(val, _values, result)
+ result = Node.new(:ID, [unescape_css_identifier(val.first)]) 
+    result
+end
 
 def _reduce_59(val, _values, result)
- result = Node.new(:ID, val) 
+ result = [val.first, unescape_css_identifier(val[1])] 
     result
 end
 
 def _reduce_60(val, _values, result)
- result = [val.first, val[1]] 
+ result = [val.first, unescape_css_string(val[1])] 
     result
 end
 
@@ -711,6 +737,10 @@ end
 
 # reduce 73 omitted
 
+# reduce 74 omitted
+
+# reduce 75 omitted
+
 def _reduce_none(val, _values, result)
   val[0]
 end