nokogiri 1.4.0 → 1.4.1

data/lib/nokogiri/css/generated_parser.rb

@@ -13,153 +13,158 @@ module Nokogiri
 ##### State transition tables begin ###
 
 racc_action_table = [
-     4,    22,    24,    26,    10,    62,     4,    72,    50,     1,
-    10,    21,     4,    23,    25,     1,    10,    10,    59,    18,
-    51,     1,     5,    10,     8,    18,    11,    14,     5,    10,
-     8,    18,    11,    14,     5,     5,     8,     8,    11,    14,
-    14,     5,    10,     8,     4,    57,    14,     5,    10,     8,
-    56,    40,    14,    46,    10,    33,    52,    40,    54,    58,
-     5,    77,     8,    18,     4,    14,     5,    78,     8,    64,
-    66,    14,     5,    34,     8,    35,    49,    14,    64,    66,
-    65,    67,    69,    18,    70,    60,    61,    56,    63,    65,
-    67,    69,    80,    70,    61,    33,    28,    63,    32,    33,
-    52,     5,    54,    33,    52,    82,    54,    83,    31,    33,
-    52,    40,    54,    87,    86,    42,   -22,    88,    89,    90,
-    91 ]
+     3,    55,    26,    21,    12,    24,    56,     3,    57,     1,
+    73,    12,    41,    56,     3,    23,     1,    79,    12,    18,
+    91,    90,     4,     1,     9,    10,    18,    13,    16,     4,
+    12,     9,    10,    18,    13,    16,     4,    12,     9,    10,
+     3,    13,    16,    41,    12,    41,    60,    61,     4,     1,
+    63,    10,    12,    44,    16,     4,    12,    12,    10,    18,
+     3,    16,     4,     3,     9,    10,    80,    13,    16,    27,
+     4,    28,    48,    10,     4,     4,    16,    10,    10,    18,
+    16,    16,    18,    12,     9,    58,    61,     9,    26,    51,
+    57,    53,    26,    51,    81,    53,    82,    66,    68,   -22,
+    62,     4,    66,    68,    10,    85,    86,    16,    67,    69,
+    70,    59,    72,    67,    69,    70,    64,    72,    32,    34,
+    36,    64,    26,    51,    54,    53,    26,    51,    31,    53,
+    33,    35,    89,     4,    92,    93,    94 ]
 
 racc_action_check = [
-     0,     2,     2,     2,     0,    33,    20,    35,    17,     0,
-    20,     2,    51,     2,     2,    20,    51,     3,    30,     0,
-    17,    51,     0,    40,     0,    20,     0,     0,    20,    15,
-    20,    51,    20,    20,    51,     3,    51,     3,    51,    51,
-     3,    40,     6,    40,    14,    28,    40,    15,     7,    15,
-    28,    38,    15,    14,    13,    18,    18,     6,    18,    29,
-     6,    49,     6,    14,     5,     6,     7,    50,     7,    34,
-    34,     7,    13,     5,    13,     5,    16,    13,    36,    36,
-    34,    34,    34,     5,    34,    32,    32,    52,    34,    36,
-    36,    36,    53,    36,    54,     4,     4,    36,     4,    62,
-    62,    12,    62,    61,    61,    57,    61,    60,     4,    56,
-    56,     9,    56,    68,    68,     8,     1,    71,    73,    76,
-    83 ]
+     0,    20,     3,     3,     0,     3,    43,    56,    51,     0,
+    28,    56,    39,    20,     9,     3,    56,    43,     9,     0,
+    71,    71,     0,     9,     0,     0,    56,     0,     0,    56,
+     7,    56,    56,     9,    56,    56,     9,     6,     9,     9,
+    30,     9,     9,    11,    30,     7,    24,    24,     7,    30,
+    26,     7,     8,    10,     7,     6,    41,    17,     6,    30,
+     4,     6,    30,    16,    30,    30,    52,    30,    30,     4,
+     8,     4,    16,     8,    41,    17,     8,    41,    17,     4,
+    41,    17,    16,    15,     4,    21,    53,    16,    61,    61,
+    21,    61,    18,    18,    54,    18,    55,    29,    29,     1,
+    25,    15,    27,    27,    15,    58,    60,    15,    29,    29,
+    29,    22,    29,    27,    27,    27,    29,    27,     5,     5,
+     5,    27,    57,    57,    19,    57,    63,    63,     5,    63,
+     5,     5,    65,    14,    74,    78,    86 ]
 
 racc_action_pointer = [
-    -2,    89,    -6,    11,    85,    62,    36,    42,   104,    90,
-   nil,   nil,    77,    48,    42,    23,    49,     8,    45,   nil,
-     4,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    38,    36,
-    -5,   nil,    74,    -7,    66,   -18,    75,   nil,    30,   nil,
-    17,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    50,
-    67,    10,    75,    69,    82,   nil,    99,    92,   nil,   nil,
-   100,    93,    89,   nil,   nil,   nil,   nil,   nil,   103,   nil,
-   nil,    92,   nil,    93,   nil,   nil,    96,   nil,   nil,   nil,
-   nil,   nil,   nil,   107,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil ]
+    -2,    71,   nil,    -8,    58,   111,    31,    24,    46,    12,
+    42,    22,   nil,   nil,   109,    77,    61,    51,    82,    96,
+     1,    78,    88,   nil,    35,    77,    38,    99,   -15,    94,
+    38,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    -9,
+   nil,    50,   nil,    -6,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    -4,    43,    74,    83,    96,     5,   112,    92,   nil,
+    99,    78,   nil,   116,   nil,   107,   nil,   nil,   nil,   nil,
+   nil,    10,   nil,   nil,   109,   nil,   nil,   nil,   112,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   123,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil ]
 
 racc_action_default = [
-   -23,   -20,   -17,   -51,   -65,   -65,   -43,   -48,   -65,   -15,
-   -52,   -21,   -12,   -50,   -65,   -49,   -65,   -65,   -65,    -2,
-   -23,    -5,    -3,    -8,    -4,    -7,    -6,   -47,   -36,   -65,
-   -65,   -27,   -34,   -35,   -55,   -65,   -55,    -9,   -42,   -11,
-   -65,   -44,   -18,   -14,   -13,   -46,   -41,   -40,   -45,   -65,
-   -65,   -23,   -36,   -65,   -34,   -16,   -65,   -65,   -28,   -29,
-   -39,   -65,   -65,   -56,   -61,   -57,   -62,   -58,   -65,   -59,
-   -60,   -65,   -26,   -65,   -10,   -64,   -65,   -19,    92,    -1,
-   -30,   -33,   -38,   -65,   -31,   -32,   -53,   -54,   -24,   -25,
-   -63,   -37 ]
+   -23,   -20,    -2,   -66,   -66,   -17,   -52,   -44,   -49,   -23,
+   -66,   -15,   -53,   -21,   -12,   -51,   -66,   -50,   -66,   -66,
+   -66,   -37,   -66,   -27,   -35,   -66,   -36,   -56,   -66,   -56,
+   -23,    -5,    -3,    -8,    -4,    -7,    -6,   -48,    -9,   -43,
+   -11,   -66,   -45,   -66,   -18,   -14,   -13,   -47,   -42,   -41,
+   -46,   -37,   -66,   -35,   -66,   -66,   -23,   -66,   -66,   -28,
+   -40,   -66,   -29,   -66,   -57,   -66,   -62,   -58,   -63,   -59,
+   -60,   -66,   -61,   -26,   -66,   -16,   -10,   -65,   -66,   -31,
+   -30,   -19,    95,    -1,   -34,   -39,   -66,   -32,   -33,   -24,
+   -54,   -55,   -25,   -64,   -38 ]
 
 racc_goto_table = [
-    29,    27,    19,    39,    38,    41,    43,    36,    71,    17,
-    73,    45,    44,    48,    53,    37,    47,    20,    30,    76,
-   nil,   nil,    55,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    74,   nil,   nil,    75,   nil,
+    22,    37,    39,    42,    75,    40,    29,    20,    30,    45,
+    47,    65,    50,    74,    38,    52,    43,    46,    49,    25,
+    78,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    83,   nil,   nil,   nil,   nil,   nil,    77,    76,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    81,    79,   nil,   nil,   nil,    84,    85 ]
+   nil,   nil,   nil,   nil,    84,   nil,   nil,   nil,    87,   nil,
+    88 ]
 
 racc_goto_check = [
-    14,     7,     2,     8,     7,     7,     8,     9,    13,     1,
-    13,     7,    10,     7,    14,     6,     9,     3,    15,    19,
-   nil,   nil,     2,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,     8,   nil,   nil,     7,   nil,
+    14,     7,     7,     7,     2,     8,     9,     1,     3,     8,
+     7,    13,     7,    13,     6,    14,     1,    10,     9,    15,
+    19,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+     2,   nil,   nil,   nil,   nil,   nil,     7,     8,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    14,     2,   nil,   nil,   nil,    14,    14 ]
+   nil,   nil,   nil,   nil,    14,   nil,   nil,   nil,    14,   nil,
+    14 ]
 
 racc_goto_pointer = [
-   nil,     9,     2,    15,   nil,   nil,     9,    -2,    -3,     2,
-     0,   nil,   nil,   -26,    -4,    14,   nil,   nil,   nil,   -21 ]
+   nil,     7,   -26,     3,   nil,   nil,     7,    -5,    -2,     2,
+     3,   nil,   nil,   -16,    -3,    16,   nil,   nil,   nil,   -21 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,   nil,     2,     6,   nil,     9,   nil,    12,
-    13,    15,    16,   nil,   nil,   nil,     3,     7,    68,   nil ]
+   nil,   nil,     2,   nil,     5,     7,   nil,    11,   nil,    14,
+    15,    17,    19,   nil,   nil,   nil,     6,     8,    71,   nil ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  3, 31, :_reduce_1,
-  1, 31, :_reduce_2,
-  1, 33, :_reduce_3,
-  1, 33, :_reduce_4,
-  1, 33, :_reduce_5,
-  1, 33, :_reduce_6,
-  1, 33, :_reduce_7,
-  1, 33, :_reduce_8,
-  2, 34, :_reduce_9,
-  3, 34, :_reduce_10,
-  2, 34, :_reduce_11,
-  1, 34, :_reduce_none,
-  2, 34, :_reduce_13,
-  2, 34, :_reduce_14,
-  1, 34, :_reduce_15,
-  3, 32, :_reduce_16,
-  1, 32, :_reduce_none,
-  2, 41, :_reduce_18,
-  3, 35, :_reduce_19,
-  1, 35, :_reduce_20,
-  1, 35, :_reduce_21,
-  1, 42, :_reduce_22,
-  0, 42, :_reduce_none,
-  4, 40, :_reduce_24,
-  4, 40, :_reduce_25,
-  3, 40, :_reduce_26,
-  2, 39, :_reduce_27,
-  3, 39, :_reduce_28,
-  3, 39, :_reduce_29,
-  3, 39, :_reduce_30,
-  3, 44, :_reduce_31,
-  3, 44, :_reduce_32,
-  3, 44, :_reduce_33,
-  1, 44, :_reduce_none,
-  1, 44, :_reduce_none,
-  1, 44, :_reduce_36,
-  4, 45, :_reduce_37,
-  3, 45, :_reduce_38,
-  2, 45, :_reduce_39,
+  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,
+  1, 35, :_reduce_15,
+  3, 33, :_reduce_16,
+  1, 33, :_reduce_none,
+  2, 42, :_reduce_18,
+  3, 36, :_reduce_19,
+  1, 36, :_reduce_20,
+  1, 36, :_reduce_21,
+  1, 43, :_reduce_22,
+  0, 43, :_reduce_none,
+  4, 41, :_reduce_24,
+  4, 41, :_reduce_25,
+  3, 41, :_reduce_26,
+  2, 40, :_reduce_27,
+  3, 40, :_reduce_28,
+  3, 40, :_reduce_29,
+  3, 40, :_reduce_30,
+  3, 40, :_reduce_31,
+  3, 45, :_reduce_32,
+  3, 45, :_reduce_33,
+  3, 45, :_reduce_34,
+  1, 45, :_reduce_none,
+  1, 45, :_reduce_none,
+  1, 45, :_reduce_37,
+  4, 46, :_reduce_38,
+  3, 46, :_reduce_39,
   2, 46, :_reduce_40,
-  2, 46, :_reduce_41,
-  1, 36, :_reduce_none,
-  0, 36, :_reduce_none,
-  2, 37, :_reduce_44,
-  2, 37, :_reduce_45,
-  2, 37, :_reduce_46,
-  2, 37, :_reduce_47,
-  1, 37, :_reduce_none,
-  1, 37, :_reduce_none,
-  1, 37, :_reduce_none,
+  2, 47, :_reduce_41,
+  2, 47, :_reduce_42,
   1, 37, :_reduce_none,
-  1, 47, :_reduce_52,
-  2, 43, :_reduce_53,
-  2, 43, :_reduce_54,
-  0, 43, :_reduce_none,
-  1, 48, :_reduce_56,
-  1, 48, :_reduce_57,
-  1, 48, :_reduce_58,
-  1, 48, :_reduce_59,
-  1, 48, :_reduce_60,
-  1, 48, :_reduce_61,
-  1, 48, :_reduce_62,
-  3, 38, :_reduce_63,
-  1, 49, :_reduce_none ]
-
-racc_reduce_n = 65
-
-racc_shift_n = 92
+  0, 37, :_reduce_none,
+  2, 38, :_reduce_45,
+  2, 38, :_reduce_46,
+  2, 38, :_reduce_47,
+  2, 38, :_reduce_48,
+  1, 38, :_reduce_none,
+  1, 38, :_reduce_none,
+  1, 38, :_reduce_none,
+  1, 38, :_reduce_none,
+  1, 48, :_reduce_53,
+  2, 44, :_reduce_54,
+  2, 44, :_reduce_55,
+  0, 44, :_reduce_none,
+  1, 49, :_reduce_57,
+  1, 49, :_reduce_58,
+  1, 49, :_reduce_59,
+  1, 49, :_reduce_60,
+  1, 49, :_reduce_61,
+  1, 49, :_reduce_62,
+  1, 49, :_reduce_63,
+  3, 39, :_reduce_64,
+  1, 50, :_reduce_none ]
+
+racc_reduce_n = 66
+
+racc_shift_n = 95
 
 racc_token_table = {
   false => 0,
@@ -188,12 +193,13 @@ racc_token_table = {
   :RPAREN => 23,
   :LSQUARE => 24,
   :RSQUARE => 25,
-  "." => 26,
-  "|" => 27,
-  "*" => 28,
-  ":" => 29 }
+  :HAS => 26,
+  "." => 27,
+  "|" => 28,
+  "*" => 29,
+  ":" => 30 }
 
-racc_nt_base = 30
+racc_nt_base = 31
 
 racc_use_result_var = true
 
@@ -240,6 +246,7 @@ Racc_token_to_s_table = [
   "RPAREN",
   "LSQUARE",
   "RSQUARE",
+  "HAS",
   "\".\"",
   "\"|\"",
   "\"*\"",
@@ -456,7 +463,8 @@ def _reduce_30(val, _values, result)
 end
 
 def _reduce_31(val, _values, result)
- result = [val.first, val.last] 
+        result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
+      
     result
 end
 
@@ -470,11 +478,16 @@ def _reduce_33(val, _values, result)
     result
 end
 
-# reduce 34 omitted
+def _reduce_34(val, _values, result)
+ result = [val.first, val.last] 
+    result
+end
 
 # reduce 35 omitted
 
-def _reduce_36(val, _values, result)
+# reduce 36 omitted
+
+def _reduce_37(val, _values, result)
         if val[0] == 'even'
           val = ["2","n","+","0"]
           result = Node.new(:AN_PLUS_B, val)
@@ -492,7 +505,7 @@ def _reduce_36(val, _values, result)
     result
 end
 
-def _reduce_37(val, _values, result)
+def _reduce_38(val, _values, result)
         if val[1] == 'n'
           result = Node.new(:AN_PLUS_B, val)
         else
@@ -502,7 +515,7 @@ def _reduce_37(val, _values, result)
     result
 end
 
-def _reduce_38(val, _values, result)
+def _reduce_39(val, _values, result)
                # n+3, -n+3
         if val[0] == 'n'
           val.unshift("1")
@@ -518,7 +531,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'
           val << "+"
           val << "0"
@@ -530,26 +543,20 @@ def _reduce_39(val, _values, result)
     result
 end
 
-def _reduce_40(val, _values, result)
+def _reduce_41(val, _values, result)
         result = Node.new(:PSEUDO_CLASS, [val[1]])
       
     result
 end
 
-def _reduce_41(val, _values, result)
+def _reduce_42(val, _values, result)
  result = Node.new(:PSEUDO_CLASS, [val[1]]) 
     result
 end
 
-# reduce 42 omitted
-
 # reduce 43 omitted
 
-def _reduce_44(val, _values, result)
-        result = Node.new(:COMBINATOR, val)
-      
-    result
-end
+# reduce 44 omitted
 
 def _reduce_45(val, _values, result)
         result = Node.new(:COMBINATOR, val)
@@ -569,7 +576,11 @@ def _reduce_47(val, _values, result)
     result
 end
 
-# reduce 48 omitted
+def _reduce_48(val, _values, result)
+        result = Node.new(:COMBINATOR, val)
+      
+    result
+end
 
 # reduce 49 omitted
 
@@ -577,65 +588,67 @@ end
 
 # reduce 51 omitted
 
-def _reduce_52(val, _values, result)
+# reduce 52 omitted
+
+def _reduce_53(val, _values, result)
  result = Node.new(:ID, val) 
     result
 end
 
-def _reduce_53(val, _values, result)
+def _reduce_54(val, _values, result)
  result = [val.first, val[1]] 
     result
 end
 
-def _reduce_54(val, _values, result)
+def _reduce_55(val, _values, result)
  result = [val.first, val[1]] 
     result
 end
 
-# reduce 55 omitted
+# reduce 56 omitted
 
-def _reduce_56(val, _values, result)
+def _reduce_57(val, _values, result)
  result = :equal 
     result
 end
 
-def _reduce_57(val, _values, result)
+def _reduce_58(val, _values, result)
  result = :prefix_match 
     result
 end
 
-def _reduce_58(val, _values, result)
+def _reduce_59(val, _values, result)
  result = :suffix_match 
     result
 end
 
-def _reduce_59(val, _values, result)
+def _reduce_60(val, _values, result)
  result = :substring_match 
     result
 end
 
-def _reduce_60(val, _values, result)
+def _reduce_61(val, _values, result)
  result = :not_equal 
     result
 end
 
-def _reduce_61(val, _values, result)
+def _reduce_62(val, _values, result)
  result = :includes 
     result
 end
 
-def _reduce_62(val, _values, result)
+def _reduce_63(val, _values, result)
  result = :dash_match 
     result
 end
 
-def _reduce_63(val, _values, result)
+def _reduce_64(val, _values, result)
         result = Node.new(:NOT, [val[1]])
       
     result
 end
 
-# reduce 64 omitted
+# reduce 65 omitted
 
 def _reduce_none(val, _values, result)
   val[0]