nokogiri 1.1.1-x86-mswin32-60 → 1.2.0-x86-mswin32-60

data/lib/nokogiri/css.rb

@@ -18,7 +18,7 @@ module Nokogiri
       ###
       # Get the XPath for +selector+.
       def xpath_for selector, options={}
-        Parser.new.xpath_for selector, options
+        Parser.new(options[:ns] || {}).xpath_for selector, options
       end
     end
   end

data/lib/nokogiri/css/generated_parser.rb

@@ -13,159 +13,153 @@ module Nokogiri
 ##### State transition tables begin ###
 
 racc_action_table = [
-     5,    28,    27,    22,    10,     5,    27,     5,    24,     1,
-    43,    10,    31,    29,    49,    27,     1,     5,    27,    53,
-    54,    31,    87,    89,    31,    59,    67,    87,    89,    54,
-    10,    68,   102,   101,    26,     7,     9,    12,    15,    10,
-     7,    18,     7,     9,    12,    15,    10,    10,    18,    90,
-    92,    93,     7,    86,    90,    92,    93,     5,    86,    43,
-    43,    10,     9,    85,    15,    10,     1,    18,    85,    10,
-    43,     9,    57,    15,    43,    43,    18,    44,     9,     9,
-    15,    15,    56,    18,    18,    38,    39,    40,    43,    43,
-    44,    72,     7,     9,    12,    15,    73,     9,    18,    15,
-    43,     9,    18,    15,    43,    55,    18,    43,    43,    43,
-    52,    34,    82,    35,    36,    51,    44,    43,    32,    95,
-    43,    97,    43,    99,   100,    15,    43,    43 ]
+     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 ]
 
 racc_action_check = [
-     0,     6,     5,     5,     0,    18,    74,    58,     5,     0,
-    38,    58,    74,     6,    18,     7,    58,    42,    75,    24,
-    24,     7,    77,    77,    75,    30,    42,    78,    78,    31,
-    14,    42,    98,    98,     5,     0,     0,     0,     0,    70,
-    18,     0,    58,    58,    58,    58,    16,    11,    58,    77,
-    77,    77,    42,    77,    78,    78,    78,    37,    78,    34,
-    35,    37,    14,    77,    14,     3,    37,    14,    78,     4,
-    36,    70,    28,    70,    29,    39,    70,    16,    16,    11,
-    16,    11,    27,    16,    11,    13,    13,    13,    43,    44,
-    46,    51,    37,    37,    37,    37,    53,     3,    37,     3,
-    54,     4,     3,     4,    56,    25,     4,    66,    67,    68,
-    23,    13,    73,    13,    13,    22,    17,    15,     9,    79,
-    81,    88,    91,    94,    96,     2,   101,   102 ]
+     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 ]
 
 racc_action_pointer = [
-    -2,   nil,    85,    59,    63,    -8,     1,     5,   nil,   107,
-   nil,    41,   nil,    78,    24,   108,    40,    79,     3,   nil,
-   nil,   nil,   108,    68,     8,    63,   nil,    70,    72,    65,
-   -17,    17,   nil,   nil,    50,    51,    61,    55,     1,    66,
-   nil,   nil,    15,    79,    80,   nil,    53,   nil,   nil,   nil,
-   nil,    75,   nil,    89,    91,   nil,    95,   nil,     5,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    98,    99,   100,   nil,
-    33,   nil,   nil,    96,    -4,     8,   nil,    19,    24,    78,
-   nil,   111,   nil,   nil,   nil,   nil,   nil,   nil,    80,   nil,
-   nil,   113,   nil,   nil,    82,   nil,    82,   nil,    22,   nil,
-   nil,   117,   118,   nil,   nil ]
+    -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 ]
 
 racc_action_default = [
-   -63,   -19,   -12,   -46,   -45,   -63,   -63,   -63,    -2,   -63,
-   -48,   -47,   -20,   -17,   -44,   -62,   -39,   -15,   -63,   -13,
-   -42,   -41,   -35,   -63,   -30,   -63,   -24,   -31,   -63,   -62,
-   -63,   -30,   -18,   -43,   -62,   -62,   -62,   -63,   -62,   -62,
-    -6,   -40,   -63,   -62,   -62,    -9,   -38,   -11,   -14,   -37,
-   -36,   -63,   -25,   -34,   -62,   -26,   -62,   105,   -63,   -27,
-    -5,    -8,    -7,   -16,    -3,    -4,   -62,   -62,   -62,   -61,
-   -63,   -10,   -33,   -63,   -63,   -63,    -1,   -51,   -51,   -63,
-   -60,   -62,   -32,   -28,   -29,   -52,   -56,   -57,   -63,   -58,
-   -53,   -62,   -54,   -55,   -63,   -23,   -63,   -22,   -63,   -21,
-   -59,   -62,   -62,   -49,   -50 ]
+   -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 ]
 
 racc_goto_table = [
-    42,    23,    50,    30,     6,    20,    21,     8,    47,    48,
-    88,    94,    19,    33,    58,    45,    41,    37,    46,    60,
-    61,    62,    25,    64,    65,    81,    66,   nil,    69,    70,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    71,    74,
-   nil,    75,   nil,   nil,    63,   nil,   nil,   nil,   nil,   nil,
-   nil,    77,    78,    79,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    76,    96,   nil,   nil,   nil,
-    83,    84,    80,   nil,   nil,   nil,    98,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   103,   104 ]
+    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,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    81,    79,   nil,   nil,   nil,    84,    85 ]
 
 racc_goto_check = [
-     2,    14,    10,    14,     1,     8,     8,     3,     9,     9,
-    13,    13,    11,     8,     2,     7,     8,     4,     8,     2,
-     2,     2,    15,     2,     2,    19,    10,   nil,     2,     2,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     9,     2,
-   nil,     2,   nil,   nil,     3,   nil,   nil,   nil,   nil,   nil,
-   nil,     2,     2,     2,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,     3,     2,   nil,   nil,   nil,
-    14,    14,     8,   nil,   nil,   nil,     2,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,     2,     2 ]
+    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,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    14,     2,   nil,   nil,   nil,    14,    14 ]
 
 racc_goto_pointer = [
-   nil,     4,   -15,     7,     4,   nil,   nil,    -1,     2,    -8,
-   -16,    10,   nil,   -67,    -4,    17,   nil,   nil,   nil,   -45 ]
+   nil,     9,     2,    15,   nil,   nil,     9,    -2,    -3,     2,
+     0,   nil,   nil,   -26,    -4,    14,   nil,   nil,   nil,   -21 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,   nil,   nil,    13,    16,   nil,    17,   nil,
-     2,     3,     4,   nil,   nil,   nil,    11,    14,    91,   nil ]
+   nil,   nil,   nil,   nil,     2,     6,   nil,     9,   nil,    12,
+    13,    15,    16,   nil,   nil,   nil,     3,     7,    68,   nil ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  4, 46, :_reduce_1,
-  1, 46, :_reduce_2,
-  2, 49, :_reduce_3,
-  2, 49, :_reduce_4,
-  2, 49, :_reduce_5,
-  1, 49, :_reduce_6,
-  2, 49, :_reduce_7,
-  2, 49, :_reduce_8,
-  2, 50, :_reduce_9,
-  3, 50, :_reduce_10,
-  2, 50, :_reduce_11,
-  1, 50, :_reduce_none,
-  2, 50, :_reduce_13,
-  2, 50, :_reduce_14,
-  1, 50, :_reduce_15,
-  3, 48, :_reduce_16,
+  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,
+  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,
+  1, 37, :_reduce_none,
+  1, 47, :_reduce_52,
+  2, 43, :_reduce_53,
+  2, 43, :_reduce_54,
+  0, 43, :_reduce_none,
   1, 48, :_reduce_none,
-  2, 57, :_reduce_18,
-  1, 51, :_reduce_19,
-  1, 51, :_reduce_20,
-  6, 56, :_reduce_21,
-  6, 56, :_reduce_22,
-  5, 56, :_reduce_23,
-  2, 55, :_reduce_24,
-  3, 55, :_reduce_25,
-  3, 55, :_reduce_26,
-  3, 55, :_reduce_27,
-  4, 59, :_reduce_28,
-  4, 59, :_reduce_29,
-  1, 59, :_reduce_none,
-  1, 59, :_reduce_none,
-  4, 60, :_reduce_32,
-  3, 60, :_reduce_33,
-  2, 60, :_reduce_34,
-  1, 60, :_reduce_35,
-  2, 61, :_reduce_36,
-  2, 61, :_reduce_37,
-  1, 52, :_reduce_none,
-  0, 52, :_reduce_none,
-  2, 53, :_reduce_40,
-  2, 53, :_reduce_41,
-  2, 53, :_reduce_42,
-  2, 53, :_reduce_43,
-  1, 53, :_reduce_none,
-  1, 53, :_reduce_none,
-  1, 53, :_reduce_none,
-  1, 53, :_reduce_none,
-  1, 62, :_reduce_48,
-  4, 58, :_reduce_49,
-  4, 58, :_reduce_50,
-  0, 58, :_reduce_none,
-  1, 63, :_reduce_none,
-  1, 63, :_reduce_none,
-  1, 63, :_reduce_none,
-  1, 63, :_reduce_none,
-  1, 63, :_reduce_none,
-  1, 63, :_reduce_none,
-  1, 63, :_reduce_none,
-  5, 54, :_reduce_59,
-  1, 64, :_reduce_none,
-  2, 47, :_reduce_none,
-  0, 47, :_reduce_none ]
-
-racc_reduce_n = 63
-
-racc_shift_n = 105
+  1, 48, :_reduce_none,
+  1, 48, :_reduce_none,
+  1, 48, :_reduce_none,
+  1, 48, :_reduce_none,
+  1, 48, :_reduce_none,
+  1, 48, :_reduce_none,
+  3, 38, :_reduce_63,
+  1, 49, :_reduce_none ]
+
+racc_reduce_n = 65
+
+racc_shift_n = 92
 
 racc_token_table = {
   false => 0,
@@ -181,40 +175,25 @@ racc_token_table = {
   :STRING => 10,
   :IDENT => 11,
   :COMMA => 12,
-  :URI => 13,
-  :CDO => 14,
-  :CDC => 15,
-  :NUMBER => 16,
-  :PERCENTAGE => 17,
-  :LENGTH => 18,
-  :EMS => 19,
-  :EXS => 20,
-  :ANGLE => 21,
-  :TIME => 22,
-  :FREQ => 23,
-  :IMPORTANT_SYM => 24,
-  :IMPORT_SYM => 25,
-  :MEDIA_SYM => 26,
-  :PAGE_SYM => 27,
-  :CHARSET_SYM => 28,
-  :DIMENSION => 29,
-  :PREFIXMATCH => 30,
-  :SUFFIXMATCH => 31,
-  :SUBSTRINGMATCH => 32,
-  :TILDE => 33,
-  :NOT_EQUAL => 34,
-  :SLASH => 35,
-  :DOUBLESLASH => 36,
-  :NOT => 37,
-  "." => 38,
-  "*" => 39,
-  "[" => 40,
-  "]" => 41,
-  ")" => 42,
-  ":" => 43,
-  "=" => 44 }
-
-racc_nt_base = 45
+  :NUMBER => 13,
+  :PREFIXMATCH => 14,
+  :SUFFIXMATCH => 15,
+  :SUBSTRINGMATCH => 16,
+  :TILDE => 17,
+  :NOT_EQUAL => 18,
+  :SLASH => 19,
+  :DOUBLESLASH => 20,
+  :NOT => 21,
+  :EQUAL => 22,
+  :RPAREN => 23,
+  :LSQUARE => 24,
+  :RSQUARE => 25,
+  "." => 26,
+  "|" => 27,
+  "*" => 28,
+  ":" => 29 }
+
+racc_nt_base = 30
 
 racc_use_result_var = true
 
@@ -248,23 +227,7 @@ Racc_token_to_s_table = [
   "STRING",
   "IDENT",
   "COMMA",
-  "URI",
-  "CDO",
-  "CDC",
   "NUMBER",
-  "PERCENTAGE",
-  "LENGTH",
-  "EMS",
-  "EXS",
-  "ANGLE",
-  "TIME",
-  "FREQ",
-  "IMPORTANT_SYM",
-  "IMPORT_SYM",
-  "MEDIA_SYM",
-  "PAGE_SYM",
-  "CHARSET_SYM",
-  "DIMENSION",
   "PREFIXMATCH",
   "SUFFIXMATCH",
   "SUBSTRINGMATCH",
@@ -273,16 +236,16 @@ Racc_token_to_s_table = [
   "SLASH",
   "DOUBLESLASH",
   "NOT",
+  "EQUAL",
+  "RPAREN",
+  "LSQUARE",
+  "RSQUARE",
   "\".\"",
+  "\"|\"",
   "\"*\"",
-  "\"[\"",
-  "\"]\"",
-  "\")\"",
   "\":\"",
-  "\"=\"",
   "$start",
   "selector",
-  "s_0toN",
   "simple_selector_1toN",
   "combinator",
   "simple_selector",
@@ -293,6 +256,7 @@ Racc_token_to_s_table = [
   "function",
   "attrib",
   "class",
+  "namespace",
   "attrib_val_0or1",
   "expr",
   "an_plus_b",
@@ -307,7 +271,7 @@ Racc_debug_parser = false
 
 # reduce 0 omitted
 
-module_eval(<<'.,.,', 'parser.y', 11)
+module_eval(<<'.,.,', 'parser.y', 9)
   def _reduce_1(val, _values, result)
             result = [val.first, val.last].flatten
       
@@ -315,56 +279,56 @@ module_eval(<<'.,.,', 'parser.y', 11)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 13)
+module_eval(<<'.,.,', 'parser.y', 11)
   def _reduce_2(val, _values, result)
      result = val.flatten 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 16)
+module_eval(<<'.,.,', 'parser.y', 14)
   def _reduce_3(val, _values, result)
      result = :DIRECT_ADJACENT_SELECTOR 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 17)
+module_eval(<<'.,.,', 'parser.y', 15)
   def _reduce_4(val, _values, result)
      result = :CHILD_SELECTOR 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 18)
+module_eval(<<'.,.,', 'parser.y', 16)
   def _reduce_5(val, _values, result)
      result = :PRECEDING_SELECTOR 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 19)
+module_eval(<<'.,.,', 'parser.y', 17)
   def _reduce_6(val, _values, result)
      result = :DESCENDANT_SELECTOR 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 20)
+module_eval(<<'.,.,', 'parser.y', 18)
   def _reduce_7(val, _values, result)
      result = :DESCENDANT_SELECTOR 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 21)
+module_eval(<<'.,.,', 'parser.y', 19)
   def _reduce_8(val, _values, result)
      result = :CHILD_SELECTOR 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 25)
+module_eval(<<'.,.,', 'parser.y', 23)
   def _reduce_9(val, _values, result)
             result =  if val[1].nil?
                     val.first
@@ -376,7 +340,7 @@ module_eval(<<'.,.,', 'parser.y', 25)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 32)
+module_eval(<<'.,.,', 'parser.y', 30)
   def _reduce_10(val, _values, result)
             result = Node.new(:CONDITIONAL_SELECTOR,
           [
@@ -389,7 +353,7 @@ module_eval(<<'.,.,', 'parser.y', 32)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 40)
+module_eval(<<'.,.,', 'parser.y', 38)
   def _reduce_11(val, _values, result)
             result = Node.new(:CONDITIONAL_SELECTOR, val)
       
@@ -399,7 +363,7 @@ module_eval(<<'.,.,', 'parser.y', 40)
 
 # reduce 12 omitted
 
-module_eval(<<'.,.,', 'parser.y', 44)
+module_eval(<<'.,.,', 'parser.y', 42)
   def _reduce_13(val, _values, result)
             result = Node.new(:CONDITIONAL_SELECTOR, val)
       
@@ -407,7 +371,7 @@ module_eval(<<'.,.,', 'parser.y', 44)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 47)
+module_eval(<<'.,.,', 'parser.y', 45)
   def _reduce_14(val, _values, result)
             result = Node.new(:CONDITIONAL_SELECTOR,
           [
@@ -420,7 +384,7 @@ module_eval(<<'.,.,', 'parser.y', 47)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 55)
+module_eval(<<'.,.,', 'parser.y', 53)
   def _reduce_15(val, _values, result)
             result = Node.new(:CONDITIONAL_SELECTOR,
           [Node.new(:ELEMENT_NAME, ['*']), val.first]
@@ -430,7 +394,7 @@ module_eval(<<'.,.,', 'parser.y', 55)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 62)
+module_eval(<<'.,.,', 'parser.y', 60)
   def _reduce_16(val, _values, result)
             result = Node.new(val[1], [val.first, val.last])
       
@@ -440,110 +404,158 @@ module_eval(<<'.,.,', 'parser.y', 62)
 
 # reduce 17 omitted
 
-module_eval(<<'.,.,', 'parser.y', 67)
+module_eval(<<'.,.,', 'parser.y', 65)
   def _reduce_18(val, _values, result)
      result = Node.new(:CLASS_CONDITION, [val[1]]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 70)
+module_eval(<<'.,.,', 'parser.y', 69)
   def _reduce_19(val, _values, result)
-     result = Node.new(:ELEMENT_NAME, val) 
+            result = Node.new(:ELEMENT_NAME,
+          [[val.first, val.last].compact.join(':')]
+        )
+      
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 71)
+module_eval(<<'.,.,', 'parser.y', 74)
   def _reduce_20(val, _values, result)
-     result = Node.new(:ELEMENT_NAME, val) 
+            name = @namespaces.key?('xmlns') ? "xmlns:#{val.first}" : val.first
+        result = Node.new(:ELEMENT_NAME, [name])
+      
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 75)
+module_eval(<<'.,.,', 'parser.y', 77)
   def _reduce_21(val, _values, result)
+     result = Node.new(:ELEMENT_NAME, val) 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 80)
+  def _reduce_22(val, _values, result)
+     result = val[0] 
+    result
+  end
+.,.,
+
+# reduce 23 omitted
+
+module_eval(<<'.,.,', 'parser.y', 85)
+  def _reduce_24(val, _values, result)
             result = Node.new(:ATTRIBUTE_CONDITION,
-          [Node.new(:ELEMENT_NAME, [val[2]])] + (val[4] || [])
+          [Node.new(:ELEMENT_NAME, [val[1]])] + (val[2] || [])
         )
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 80)
-  def _reduce_22(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 90)
+  def _reduce_25(val, _values, result)
             result = Node.new(:ATTRIBUTE_CONDITION,
-          [val[2]] + (val[4] || [])
+          [val[1]] + (val[2] || [])
         )
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 85)
-  def _reduce_23(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 95)
+  def _reduce_26(val, _values, result)
             # Non standard, but hpricot supports it.
         result = Node.new(:PSEUDO_CLASS,
-          [Node.new(:FUNCTION, ['nth-child(', val[2]])]
+          [Node.new(:FUNCTION, ['nth-child(', val[1]])]
         )
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 93)
-  def _reduce_24(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 103)
+  def _reduce_27(val, _values, result)
             result = Node.new(:FUNCTION, [val.first.strip])
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 96)
-  def _reduce_25(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 106)
+  def _reduce_28(val, _values, result)
             result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 99)
-  def _reduce_26(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 109)
+  def _reduce_29(val, _values, result)
             result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 102)
-  def _reduce_27(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 112)
+  def _reduce_30(val, _values, result)
             result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 106)
-  def _reduce_28(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 116)
+  def _reduce_31(val, _values, result)
      result = [val.first, val.last] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 107)
-  def _reduce_29(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 117)
+  def _reduce_32(val, _values, result)
+     result = [val.first, val.last] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 118)
+  def _reduce_33(val, _values, result)
      result = [val.first, val.last] 
     result
   end
 .,.,
 
-# reduce 30 omitted
+# reduce 34 omitted
 
-# reduce 31 omitted
+# reduce 35 omitted
 
-module_eval(<<'.,.,', 'parser.y', 114)
-  def _reduce_32(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 123)
+  def _reduce_36(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
+      
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 141)
+  def _reduce_37(val, _values, result)
             if val[1] == 'n'
           result = Node.new(:AN_PLUS_B, val)
         else
@@ -554,8 +566,8 @@ module_eval(<<'.,.,', 'parser.y', 114)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 120)
-  def _reduce_33(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 147)
+  def _reduce_38(val, _values, result)
                    # n+3, -n+3
         if val[0] == 'n'
           val.unshift("1")
@@ -572,8 +584,8 @@ module_eval(<<'.,.,', 'parser.y', 120)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 134)
-  def _reduce_34(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 161)
+  def _reduce_39(val, _values, result)
             if val[1] == 'n'
           val << "+"
           val << "0"
@@ -586,110 +598,86 @@ module_eval(<<'.,.,', 'parser.y', 134)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 144)
-  def _reduce_35(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
-          raise Racc::ParseError, "parse error on IDENT '#{val[0]}'"
-        end
-      
-    result
-  end
-.,.,
-
-module_eval(<<'.,.,', 'parser.y', 157)
-  def _reduce_36(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 172)
+  def _reduce_40(val, _values, result)
             result = Node.new(:PSEUDO_CLASS, [val[1]])
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 159)
-  def _reduce_37(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 174)
+  def _reduce_41(val, _values, result)
      result = Node.new(:PSEUDO_CLASS, [val[1]]) 
     result
   end
 .,.,
 
-# reduce 38 omitted
+# reduce 42 omitted
 
-# reduce 39 omitted
+# reduce 43 omitted
 
-module_eval(<<'.,.,', 'parser.y', 167)
-  def _reduce_40(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 182)
+  def _reduce_44(val, _values, result)
             result = Node.new(:COMBINATOR, val)
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 170)
-  def _reduce_41(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 185)
+  def _reduce_45(val, _values, result)
             result = Node.new(:COMBINATOR, val)
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 173)
-  def _reduce_42(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 188)
+  def _reduce_46(val, _values, result)
             result = Node.new(:COMBINATOR, val)
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 176)
-  def _reduce_43(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 191)
+  def _reduce_47(val, _values, result)
             result = Node.new(:COMBINATOR, val)
       
     result
   end
 .,.,
 
-# reduce 44 omitted
+# reduce 48 omitted
 
-# reduce 45 omitted
+# reduce 49 omitted
 
-# reduce 46 omitted
+# reduce 50 omitted
 
-# reduce 47 omitted
+# reduce 51 omitted
 
-module_eval(<<'.,.,', 'parser.y', 184)
-  def _reduce_48(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 199)
+  def _reduce_52(val, _values, result)
      result = Node.new(:ID, val) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 187)
-  def _reduce_49(val, _values, result)
-     result = [val.first, val[2]] 
+module_eval(<<'.,.,', 'parser.y', 202)
+  def _reduce_53(val, _values, result)
+     result = [val.first, val[1]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 188)
-  def _reduce_50(val, _values, result)
-     result = [val.first, val[2]] 
+module_eval(<<'.,.,', 'parser.y', 203)
+  def _reduce_54(val, _values, result)
+     result = [val.first, val[1]] 
     result
   end
 .,.,
 
-# reduce 51 omitted
-
-# reduce 52 omitted
-
-# reduce 53 omitted
-
-# reduce 54 omitted
-
 # reduce 55 omitted
 
 # reduce 56 omitted
@@ -698,13 +686,7 @@ module_eval(<<'.,.,', 'parser.y', 188)
 
 # reduce 58 omitted
 
-module_eval(<<'.,.,', 'parser.y', 202)
-  def _reduce_59(val, _values, result)
-            result = Node.new(:NOT, [val[2]])
-      
-    result
-  end
-.,.,
+# reduce 59 omitted
 
 # reduce 60 omitted
 
@@ -712,6 +694,16 @@ module_eval(<<'.,.,', 'parser.y', 202)
 
 # reduce 62 omitted
 
+module_eval(<<'.,.,', 'parser.y', 217)
+  def _reduce_63(val, _values, result)
+            result = Node.new(:NOT, [val[1]])
+      
+    result
+  end
+.,.,
+
+# reduce 64 omitted
+
 def _reduce_none(val, _values, result)
   val[0]
 end