nokogiri 1.6.0 → 1.13.2

data/lib/nokogiri/css/parser.rb

@@ -1,189 +1,242 @@
+# frozen_string_literal: true
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.8
-# from Racc grammer file "".
+# This file is automatically generated by Racc 1.6.0
+# from Racc grammar file "".
 #
 
 require 'racc/parser.rb'
 
 
-require 'nokogiri/css/parser_extras'
+require_relative "parser_extras"
+
+module Nokogiri
+  module CSS
+    # :nodoc: all
+    class Parser < Racc::Parser
+    end
+  end
+end
+
 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 ]
+    27,    11,    38,    99,    36,    12,    40,    26,    48,    25,
+    49,    27,   100,    12,    30,    36,   105,    99,   -26,    28,
+    25,   -26,    26,    27,    29,    14,    21,    23,    80,    30,
+    28,    36,    72,    26,   -26,    29,    14,    21,    23,    27,
+    30,    91,    56,    36,    97,    96,    43,    29,    25,    26,
+    27,    92,    94,    21,    36,    95,    30,    98,    28,    25,
+   101,    26,   102,    29,    14,    21,    23,    96,    30,    28,
+    36,    36,    26,   103,    29,    14,    21,    23,    27,    30,
+   108,   107,    36,   109,   106,    43,    43,    25,    26,    26,
+    27,   110,    21,    21,   111,    30,    30,    28,    99,    50,
+    26,    53,    29,    14,    21,    23,    36,    30,    36,    56,
+    61,    64,   113,    66,    29,    14,   116,    36,   118,    36,
+   nil,    43,   nil,    43,    26,   nil,    26,    14,    21,    23,
+    21,    30,    43,    30,    43,    26,   nil,    26,    36,    21,
+    36,    21,    30,    25,    30,   nil,   nil,   nil,   nil,   nil,
+   nil,    61,    62,    43,    60,    43,    26,   nil,    26,   nil,
+    21,    23,    21,    30,    57,    30,    88,    89,    14,   nil,
+   nil,    88,    89,   nil,   nil,   nil,   nil,    84,    85,    86,
+   nil,    87,    84,    85,    86,    83,    87,   nil,    61,    93,
+    83,    66,    61,    93,   nil,    66,    61,    93,   nil,    66,
+    61,    93,   nil,    66,   nil,    14,   nil,    61,    93,    14,
+    66,   nil,   nil,    14,   nil,   nil,   nil,    14,     4,     5,
+    10,   nil,   nil,   nil,    14,     4,     5,    47,     6,   nil,
+     8,     7,     4,     5,    10,     6,   nil,     8,     7,   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,     1,    11,    64,     3,    70,    14,    17,    21,     3,
+    24,     9,    62,     1,    17,     9,    70,    62,    25,     3,
+     9,    64,     3,    30,     3,     3,     3,     3,    49,     3,
+     9,    16,    30,     9,    50,     9,     9,     9,     9,    12,
+     9,    53,    30,    12,    60,    60,    16,    30,    12,    16,
+    46,    54,    58,    16,    46,    59,    16,    61,    12,    46,
+    63,    12,    65,    12,    12,    12,    12,    66,    12,    46,
+    31,    32,    46,    67,    46,    46,    46,    46,    47,    46,
+    82,    82,    47,    82,    81,    31,    32,    47,    31,    32,
+    26,    90,    31,    32,    92,    31,    32,    47,    93,    26,
+    47,    26,    47,    47,    47,    47,    28,    47,    33,    26,
+    28,    28,    97,    28,    26,    26,   100,    34,   113,    35,
+   nil,    28,   nil,    33,    28,   nil,    33,    28,    28,    28,
+    33,    28,    34,    33,    35,    34,   nil,    35,    43,    34,
+    68,    35,    34,    43,    35,   nil,   nil,   nil,   nil,   nil,
+   nil,    27,    27,    43,    27,    68,    43,   nil,    68,   nil,
+    43,    43,    68,    43,    27,    68,    51,    51,    27,   nil,
+   nil,    52,    52,   nil,   nil,   nil,   nil,    51,    51,    51,
+   nil,    51,    52,    52,    52,    51,    52,   nil,    56,    56,
+    52,    56,    96,    96,   nil,    96,    98,    98,   nil,    98,
+    99,    99,   nil,    99,   nil,    56,   nil,   101,   101,    96,
+   101,   nil,   nil,    98,   nil,   nil,   nil,    99,     0,     0,
+     0,   nil,   nil,   nil,   101,    20,    20,    20,     0,   nil,
+     0,     0,    29,    29,    29,    20,   nil,    20,    20,   nil,
+   nil,   nil,    29,   nil,    29,    29 ]
 
 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 ]
+   211,     1,   nil,    -2,   nil,   nil,   nil,   nil,   nil,     9,
+   nil,     2,    37,   nil,    -5,   nil,    25,   -17,   nil,   nil,
+   218,    -3,   nil,   nil,   -20,   -12,    88,   141,   100,   225,
+    21,    64,    65,   102,   111,   113,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   132,   nil,   nil,    48,    76,   nil,    17,
+     4,   163,   168,    16,    21,   nil,   178,   nil,    29,    32,
+    33,    45,     5,    48,    -9,    39,    55,    50,   134,   nil,
+    -7,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    59,    70,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    66,   nil,    83,    86,   nil,   nil,   182,   105,   186,   190,
+   103,   197,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   105,   nil,   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 ]
+   -81,   -82,    -2,   -27,    -4,    -5,    -6,    -7,    -8,   -27,
+   -80,   -82,   -27,    -3,   -82,   -10,   -53,   -12,   -15,   -16,
+   -20,   -82,   -22,   -23,   -82,   -25,   -27,   -82,   -27,   -81,
+   -82,   -59,   -60,   -61,   -62,   -63,   -64,   -17,   119,    -1,
+    -9,   -11,   -52,   -27,   -13,   -14,   -27,   -27,   -21,   -82,
+   -32,   -68,   -68,   -82,   -82,   -33,   -82,   -34,   -82,   -82,
+   -43,   -44,   -45,   -46,   -25,   -82,   -43,   -82,   -77,   -79,
+   -82,   -50,   -51,   -54,   -55,   -56,   -57,   -58,   -18,   -19,
+   -24,   -82,   -82,   -69,   -70,   -71,   -72,   -73,   -74,   -75,
+   -82,   -30,   -82,   -45,   -35,   -36,   -82,   -49,   -82,   -82,
+   -82,   -82,   -37,   -76,   -78,   -38,   -28,   -65,   -66,   -67,
+   -29,   -31,   -39,   -82,   -40,   -41,   -48,   -42,   -47 ]
 
 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,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    94,   nil,   nil,   nil,   nil,   100,   nil,   102,   103 ]
+    58,    42,    13,     1,    46,    52,    19,    68,    37,    71,
+    41,    39,    19,    69,    44,    19,    73,    74,    75,    76,
+    77,    45,    68,    81,    90,    54,    51,    59,    69,    55,
+   nil,   nil,    70,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    78,    79,   nil,   nil,    19,
+    19,   nil,   nil,   104,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   112,
+   nil,   114,   115,   nil,   117 ]
 
 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,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-     8,   nil,   nil,   nil,   nil,    18,   nil,    18,    18 ]
+    20,    14,     2,     1,     5,    11,     7,     9,     2,    11,
+    10,     2,     7,    14,    12,     7,    14,    14,    14,    14,
+    14,    13,     9,    19,    19,    17,    18,    21,    14,     7,
+   nil,   nil,     1,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,     2,     2,   nil,   nil,     7,
+     7,   nil,   nil,    14,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    20,
+   nil,    20,    20,   nil,    20 ]
 
 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,   -16,   nil,     3,   nil,   -21,
+    -6,   -21,    -3,     4,   -15,   nil,   nil,    -1,     0,   -28,
+   -27,     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,    15,    63,    20,    16,
+   nil,    17,    34,    33,    18,    32,    22,    24,   nil,   nil,
+    65,   nil,    31,    35,    82,    67 ]
 
 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,
+  3, 33, :_reduce_1,
+  1, 33, :_reduce_2,
+  2, 33, :_reduce_3,
+  1, 37, :_reduce_4,
+  1, 37, :_reduce_5,
+  1, 37, :_reduce_6,
+  1, 37, :_reduce_7,
+  1, 37, :_reduce_8,
+  2, 38, :_reduce_9,
+  1, 39, :_reduce_10,
+  2, 40, :_reduce_11,
+  1, 40, :_reduce_none,
+  2, 40, :_reduce_13,
+  2, 40, :_reduce_14,
+  1, 40, :_reduce_15,
+  1, 40, :_reduce_none,
+  2, 35, :_reduce_17,
+  3, 34, :_reduce_18,
+  3, 34, :_reduce_19,
+  1, 34, :_reduce_none,
+  2, 47, :_reduce_21,
+  1, 41, :_reduce_none,
+  1, 41, :_reduce_23,
+  3, 48, :_reduce_24,
+  1, 48, :_reduce_25,
+  1, 49, :_reduce_26,
+  0, 49, :_reduce_none,
+  4, 45, :_reduce_28,
+  4, 45, :_reduce_29,
+  3, 45, :_reduce_30,
+  3, 50, :_reduce_31,
+  1, 50, :_reduce_32,
+  1, 50, :_reduce_none,
+  2, 43, :_reduce_34,
+  3, 43, :_reduce_35,
+  3, 43, :_reduce_36,
+  3, 43, :_reduce_37,
+  3, 43, :_reduce_38,
+  3, 52, :_reduce_39,
+  3, 52, :_reduce_40,
+  3, 52, :_reduce_41,
+  3, 52, :_reduce_42,
+  1, 52, :_reduce_none,
+  1, 52, :_reduce_none,
+  1, 52, :_reduce_45,
+  1, 52, :_reduce_none,
+  4, 53, :_reduce_47,
+  3, 53, :_reduce_48,
+  2, 53, :_reduce_49,
+  2, 44, :_reduce_50,
+  2, 44, :_reduce_51,
+  1, 42, :_reduce_none,
+  0, 42, :_reduce_none,
+  2, 46, :_reduce_54,
+  2, 46, :_reduce_55,
+  2, 46, :_reduce_56,
+  2, 46, :_reduce_57,
+  2, 46, :_reduce_58,
+  1, 46, :_reduce_none,
+  1, 46, :_reduce_none,
+  1, 46, :_reduce_none,
+  1, 46, :_reduce_none,
+  1, 46, :_reduce_none,
+  1, 54, :_reduce_64,
+  2, 51, :_reduce_65,
+  2, 51, :_reduce_66,
+  2, 51, :_reduce_67,
+  0, 51, :_reduce_none,
+  1, 56, :_reduce_69,
+  1, 56, :_reduce_70,
+  1, 56, :_reduce_71,
+  1, 56, :_reduce_72,
+  1, 56, :_reduce_73,
+  1, 56, :_reduce_74,
+  1, 56, :_reduce_75,
+  3, 55, :_reduce_76,
+  1, 57, :_reduce_none,
+  2, 57, :_reduce_none,
+  1, 57, :_reduce_none,
   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,
-  1, 37, :_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,
-  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
+  0, 36, :_reduce_none ]
+
+racc_reduce_n = 82
+
+racc_shift_n = 119
 
 racc_token_table = {
   false => 0,
@@ -213,12 +266,13 @@ racc_token_table = {
   :LSQUARE => 24,
   :RSQUARE => 25,
   :HAS => 26,
-  "." => 27,
-  "*" => 28,
-  "|" => 29,
-  ":" => 30 }
+  "@" => 27,
+  "." => 28,
+  "*" => 29,
+  "|" => 30,
+  ":" => 31 }
 
-racc_nt_base = 31
+racc_nt_base = 32
 
 racc_use_result_var = true
 
@@ -266,6 +320,7 @@ Racc_token_to_s_table = [
   "LSQUARE",
   "RSQUARE",
   "HAS",
+  "\"@\"",
   "\".\"",
   "\"*\"",
   "\"|\"",
@@ -274,23 +329,26 @@ Racc_token_to_s_table = [
   "selector",
   "simple_selector_1toN",
   "prefixless_combinator_selector",
+  "optional_S",
   "combinator",
+  "xpath_attribute_name",
+  "xpath_attribute",
   "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" ]
 
@@ -301,420 +359,412 @@ Racc_debug_parser = false
 # reduce 0 omitted
 
 def _reduce_1(val, _values, result)
-        result = [val.first, val.last].flatten
-      
+      result = [val[0], val[2]].flatten
+
     result
 end
 
 def _reduce_2(val, _values, result)
- result = val.flatten 
+ result = val.flatten
     result
 end
 
 def _reduce_3(val, _values, result)
- result = val.flatten 
+ result = [val[1]].flatten
     result
 end
 
 def _reduce_4(val, _values, result)
- result = :DIRECT_ADJACENT_SELECTOR 
+ result = :DIRECT_ADJACENT_SELECTOR
     result
 end
 
 def _reduce_5(val, _values, result)
- result = :CHILD_SELECTOR 
+ result = :CHILD_SELECTOR
     result
 end
 
 def _reduce_6(val, _values, result)
- result = :FOLLOWING_SELECTOR 
+ result = :FOLLOWING_SELECTOR
     result
 end
 
 def _reduce_7(val, _values, result)
- result = :DESCENDANT_SELECTOR 
+ result = :DESCENDANT_SELECTOR
     result
 end
 
 def _reduce_8(val, _values, result)
- result = :DESCENDANT_SELECTOR 
+ result = :CHILD_SELECTOR
     result
 end
 
 def _reduce_9(val, _values, result)
- result = :CHILD_SELECTOR 
+ result = val[1]
     result
 end
 
 def _reduce_10(val, _values, result)
-        result =  if val[1].nil?
-                    val.first
-                  else
-                    Node.new(:CONDITIONAL_SELECTOR, [val.first, val[1]])
-                  end
-      
+ result = Node.new(:ATTRIB_NAME, [val[0]])
     result
 end
 
 def _reduce_11(val, _values, result)
-        result = Node.new(:CONDITIONAL_SELECTOR,
-          [
-            val.first,
-            Node.new(:COMBINATOR, [val[1], val.last])
-          ]
-        )
-      
+      result =  if val[1].nil?
+                  val[0]
+                else
+                  Node.new(:CONDITIONAL_SELECTOR, [val[0], val[1]])
+                end
+
     result
 end
 
-def _reduce_12(val, _values, result)
-        result = Node.new(:CONDITIONAL_SELECTOR, val)
-      
+# reduce 12 omitted
+
+def _reduce_13(val, _values, result)
+ result = Node.new(:CONDITIONAL_SELECTOR, val)
     result
 end
 
-# reduce 13 omitted
-
 def _reduce_14(val, _values, result)
-        result = Node.new(:CONDITIONAL_SELECTOR, val)
-      
+ result = Node.new(:CONDITIONAL_SELECTOR, val)
     result
 end
 
 def _reduce_15(val, _values, result)
-        result = Node.new(:CONDITIONAL_SELECTOR, val)
-      
+ result = Node.new(:CONDITIONAL_SELECTOR, [Node.new(:ELEMENT_NAME, ['*']), val[0]])
     result
 end
 
-def _reduce_16(val, _values, result)
-        result = Node.new(:CONDITIONAL_SELECTOR,
-          [
-            Node.new(:ELEMENT_NAME, ['*']),
-            Node.new(:COMBINATOR, val)
-          ]
-        )
-      
-    result
-end
+# reduce 16 omitted
 
 def _reduce_17(val, _values, result)
-        result = Node.new(:CONDITIONAL_SELECTOR,
-          [Node.new(:ELEMENT_NAME, ['*']), val.first]
-        )
-      
+ result = Node.new(val[0], [nil, val[1]])
     result
 end
 
 def _reduce_18(val, _values, result)
-        result = Node.new(val.first, [nil, val.last])
-      
+ result = Node.new(val[1], [val[0], val[2]])
     result
 end
 
 def _reduce_19(val, _values, result)
-        result = Node.new(val[1], [val.first, val.last])
-      
+ result = Node.new(:DESCENDANT_SELECTOR, [val[0], val[2]])
     result
 end
 
 # reduce 20 omitted
 
 def _reduce_21(val, _values, result)
- result = Node.new(:CLASS_CONDITION, [val[1]]) 
+ result = Node.new(:CLASS_CONDITION, [unescape_css_identifier(val[1])])
     result
 end
 
 # reduce 22 omitted
 
 def _reduce_23(val, _values, result)
- result = Node.new(:ELEMENT_NAME, val) 
+ result = Node.new(:ELEMENT_NAME, val)
     result
 end
 
 def _reduce_24(val, _values, result)
-        result = Node.new(:ELEMENT_NAME,
-          [[val.first, val.last].compact.join(':')]
-        )
-      
+ result = Node.new(:ELEMENT_NAME, [[val[0], val[2]].compact.join(':')])
     result
 end
 
 def _reduce_25(val, _values, result)
-        name = @namespaces.key?('xmlns') ? "xmlns:#{val.first}" : val.first
-        result = Node.new(:ELEMENT_NAME, [name])
-      
+      name = @namespaces.key?('xmlns') ? "xmlns:#{val[0]}" : val[0]
+      result = Node.new(:ELEMENT_NAME, [name])
+
     result
 end
 
 def _reduce_26(val, _values, result)
- result = val[0] 
+ result = val[0]
     result
 end
 
 # reduce 27 omitted
 
 def _reduce_28(val, _values, result)
-        result = Node.new(:ATTRIBUTE_CONDITION,
-          [val[1]] + (val[2] || [])
-        )
-      
+      result = Node.new(:ATTRIBUTE_CONDITION, [val[1]] + (val[2] || []))
+
     result
 end
 
 def _reduce_29(val, _values, result)
-        result = Node.new(:ATTRIBUTE_CONDITION,
-          [val[1]] + (val[2] || [])
-        )
-      
+      result = Node.new(:ATTRIBUTE_CONDITION, [val[1]] + (val[2] || []))
+
     result
 end
 
 def _reduce_30(val, _values, result)
-        # Non standard, but hpricot supports it.
-        result = Node.new(:PSEUDO_CLASS,
-          [Node.new(:FUNCTION, ['nth-child(', val[1]])]
-        )
-      
+      result = Node.new(:PSEUDO_CLASS, [Node.new(:FUNCTION, ['nth-child(', val[1]])])
+
     result
 end
 
 def _reduce_31(val, _values, result)
-        result = Node.new(:ELEMENT_NAME,
-          [[val.first, val.last].compact.join(':')]
-        )
-      
+ result = Node.new(:ATTRIB_NAME, [[val[0], val[2]].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 = Node.new(:ATTRIB_NAME, [val[0]])
     result
 end
 
-def _reduce_33(val, _values, result)
-        result = Node.new(:FUNCTION, [val.first.strip])
-      
-    result
-end
+# reduce 33 omitted
 
 def _reduce_34(val, _values, result)
-        result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
-      
+      result = Node.new(:FUNCTION, [val[0].strip])
+
     result
 end
 
 def _reduce_35(val, _values, result)
-        result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
-      
+      result = Node.new(:FUNCTION, [val[0].strip, val[1]].flatten)
+
     result
 end
 
 def _reduce_36(val, _values, result)
-        result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
-      
+      result = Node.new(:FUNCTION, [val[0].strip, val[1]].flatten)
+
     result
 end
 
 def _reduce_37(val, _values, result)
-        result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
-      
+      result = Node.new(:FUNCTION, [val[0].strip, val[1]].flatten)
+
     result
 end
 
 def _reduce_38(val, _values, result)
- result = [val.first, val.last] 
+      result = Node.new(:FUNCTION, [val[0].strip, val[1]].flatten)
+
     result
 end
 
 def _reduce_39(val, _values, result)
- result = [val.first, val.last] 
+ result = [val[0], val[2]]
     result
 end
 
 def _reduce_40(val, _values, result)
- result = [val.first, val.last] 
+ result = [val[0], val[2]]
     result
 end
 
-# reduce 41 omitted
-
-# reduce 42 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)
-        else
-          # This is not CSS standard.  It allows us to support this:
-          # assert_xpath("//a[foo(., @href)]", @parser.parse('a:foo(@href)'))
-          # assert_xpath("//a[foo(., @a, b)]", @parser.parse('a:foo(@a, b)'))
-          # assert_xpath("//a[foo(., a, 10)]", @parser.parse('a:foo(a, 10)'))
-          result = val
-        end
-      
+def _reduce_41(val, _values, result)
+ result = [val[0], val[2]]
     result
 end
 
-def _reduce_44(val, _values, result)
-        if val[1] == 'n'
-          result = Node.new(:AN_PLUS_B, val)
-        else
-          raise Racc::ParseError, "parse error on IDENT '#{val[1]}'"
-        end
-      
+def _reduce_42(val, _values, result)
+ result = [val[0], val[2]]
     result
 end
 
+# reduce 43 omitted
+
+# reduce 44 omitted
+
 def _reduce_45(val, _values, result)
-               # n+3, -n+3
-        if val[0] == 'n'
-          val.unshift("1")
-          result = Node.new(:AN_PLUS_B, val)
-        elsif val[0] == '-n'
-          val[0] = 'n'
-          val.unshift("-1")
-          result = Node.new(:AN_PLUS_B, val)
-        else
-          raise Racc::ParseError, "parse error on IDENT '#{val[1]}'"
-        end
-      
-    result
-end
+      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
+        result = val
+      end
 
-def _reduce_46(val, _values, result)
-        if val[1] == 'n'
-          val << "+"
-          val << "0"
-          result = Node.new(:AN_PLUS_B, val)
-        else
-          raise Racc::ParseError, "parse error on IDENT '#{val[1]}'"
-        end
-      
     result
 end
 
+# reduce 46 omitted
+
 def _reduce_47(val, _values, result)
-        result = Node.new(:PSEUDO_CLASS, [val[1]])
-      
+      if val[1] == 'n'
+        result = Node.new(:NTH, val)
+      else
+        raise Racc::ParseError, "parse error on IDENT '#{val[1]}'"
+      end
+
     result
 end
 
 def _reduce_48(val, _values, result)
- result = Node.new(:PSEUDO_CLASS, [val[1]]) 
+               # n+3, -n+3
+      if val[0] == 'n'
+        val.unshift("1")
+        result = Node.new(:NTH, val)
+      elsif val[0] == '-n'
+        val[0] = 'n'
+        val.unshift("-1")
+        result = Node.new(:NTH, val)
+      else
+        raise Racc::ParseError, "parse error on IDENT '#{val[1]}'"
+      end
+
     result
 end
 
-# reduce 49 omitted
-
-# reduce 50 omitted
+def _reduce_49(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(:NTH, val)
+      else
+        raise Racc::ParseError, "parse error on IDENT '#{val[1]}'"
+      end
 
-def _reduce_51(val, _values, result)
-        result = Node.new(:COMBINATOR, val)
-      
     result
 end
 
-def _reduce_52(val, _values, result)
-        result = Node.new(:COMBINATOR, val)
-      
+def _reduce_50(val, _values, result)
+      result = Node.new(:PSEUDO_CLASS, [val[1]])
+
     result
 end
 
-def _reduce_53(val, _values, result)
-        result = Node.new(:COMBINATOR, val)
-      
+def _reduce_51(val, _values, result)
+ result = Node.new(:PSEUDO_CLASS, [val[1]])
     result
 end
 
+# reduce 52 omitted
+
+# reduce 53 omitted
+
 def _reduce_54(val, _values, result)
-        result = Node.new(:COMBINATOR, val)
-      
+      result = Node.new(:COMBINATOR, val)
+
     result
 end
 
-# reduce 55 omitted
+def _reduce_55(val, _values, result)
+      result = Node.new(:COMBINATOR, val)
 
-# reduce 56 omitted
-
-# reduce 57 omitted
+    result
+end
 
-# reduce 58 omitted
+def _reduce_56(val, _values, result)
+      result = Node.new(:COMBINATOR, val)
 
-def _reduce_59(val, _values, result)
- result = Node.new(:ID, val) 
     result
 end
 
-def _reduce_60(val, _values, result)
- result = [val.first, val[1]] 
+def _reduce_57(val, _values, result)
+      result = Node.new(:COMBINATOR, val)
+
     result
 end
 
-def _reduce_61(val, _values, result)
- result = [val.first, val[1]] 
+def _reduce_58(val, _values, result)
+      result = Node.new(:COMBINATOR, val)
+
     result
 end
 
+# reduce 59 omitted
+
+# reduce 60 omitted
+
+# reduce 61 omitted
+
 # reduce 62 omitted
 
-def _reduce_63(val, _values, result)
- result = :equal 
-    result
-end
+# reduce 63 omitted
 
 def _reduce_64(val, _values, result)
- result = :prefix_match 
+ result = Node.new(:ID, [unescape_css_identifier(val[0])])
     result
 end
 
 def _reduce_65(val, _values, result)
- result = :suffix_match 
+ result = [val[0], unescape_css_identifier(val[1])]
     result
 end
 
 def _reduce_66(val, _values, result)
- result = :substring_match 
+ result = [val[0], unescape_css_string(val[1])]
     result
 end
 
 def _reduce_67(val, _values, result)
- result = :not_equal 
+ result = [val[0], val[1]]
     result
 end
 
-def _reduce_68(val, _values, result)
- result = :includes 
-    result
-end
+# reduce 68 omitted
 
 def _reduce_69(val, _values, result)
- result = :dash_match 
+ result = :equal
     result
 end
 
 def _reduce_70(val, _values, result)
-        result = Node.new(:NOT, [val[1]])
-      
+ result = :prefix_match
     result
 end
 
-# reduce 71 omitted
+def _reduce_71(val, _values, result)
+ result = :suffix_match
+    result
+end
+
+def _reduce_72(val, _values, result)
+ result = :substring_match
+    result
+end
+
+def _reduce_73(val, _values, result)
+ result = :not_equal
+    result
+end
+
+def _reduce_74(val, _values, result)
+ result = :includes
+    result
+end
+
+def _reduce_75(val, _values, result)
+ result = :dash_match
+    result
+end
+
+def _reduce_76(val, _values, result)
+      result = Node.new(:NOT, [val[1]])
+
+    result
+end
+
+# reduce 77 omitted
+
+# reduce 78 omitted
+
+# reduce 79 omitted
 
-# reduce 72 omitted
+# reduce 80 omitted
 
-# reduce 73 omitted
+# reduce 81 omitted
 
 def _reduce_none(val, _values, result)
   val[0]
 end
 
     end   # class Parser
-    end   # module CSS
-  end   # module Nokogiri
+  end   # module CSS
+end   # module Nokogiri