nokogiri 1.1.0 → 1.1.1

data/ext/nokogiri/xml_reader.c

@@ -78,11 +78,11 @@ static VALUE attributes_eh(VALUE self)
 
 /*
  * call-seq:
- *   attributes
+ *   namespaces
  *
- * Get a Hash of attributes for this node
+ * Get a hash of namespaces for this Node
  */
-static VALUE attributes(VALUE self)
+static VALUE namespaces(VALUE self)
 {
   xmlTextReaderPtr reader;
   VALUE attr ;
@@ -98,6 +98,40 @@ static VALUE attributes(VALUE self)
   if(ptr == NULL) return Qnil;
 
   Nokogiri_xml_node_namespaces(ptr, attr);
+
+  return attr ;
+}
+
+/*
+ * call-seq:
+ *   attribute_nodes
+ *
+ * Get a list of attributes for this Node
+ */
+static VALUE attribute_nodes(VALUE self)
+{
+  xmlTextReaderPtr reader;
+  VALUE attr ;
+
+  Data_Get_Struct(self, xmlTextReader, reader);
+
+  attr = rb_ary_new() ;
+
+  if (! has_attributes(reader))
+    return attr ;
+
+  xmlNodePtr ptr = xmlTextReaderExpand(reader);
+  if(ptr == NULL) return Qnil;
+
+  // FIXME I'm not sure if this is correct.....  I don't really like pointing
+  // at this document, but I have to because of the assertions in
+  // the node wrapping code.
+  if(!ptr->doc->_private) {
+    VALUE rb_doc = Data_Wrap_Struct(cNokogiriXmlDocument, 0, 0, ptr->doc);
+    rb_iv_set(rb_doc, "@decorators", Qnil);
+    ptr->doc->_private = (void *)rb_doc;
+  }
+
   Nokogiri_xml_node_properties(ptr, attr);
 
   return attr ;
@@ -422,8 +456,9 @@ void init_xml_reader()
   rb_define_method(klass, "depth", depth, 0);
   rb_define_method(klass, "attribute_count", attribute_count, 0);
   rb_define_method(klass, "attribute", reader_attribute, 1);
+  rb_define_method(klass, "namespaces", namespaces, 0);
   rb_define_method(klass, "attribute_at", attribute_at, 1);
-  rb_define_method(klass, "attributes", attributes, 0);
+  rb_define_method(klass, "attribute_nodes", attribute_nodes, 0);
   rb_define_method(klass, "attributes?", attributes_eh, 0);
   rb_define_method(klass, "value?", value_eh, 0);
   rb_define_method(klass, "default?", default_eh, 0);

data/ext/nokogiri/xml_text.c

@@ -26,6 +26,7 @@ void init_xml_text()
 {
   VALUE nokogiri = rb_define_module("Nokogiri");
   VALUE xml = rb_define_module_under(nokogiri, "XML");
+  /* */
   VALUE node = rb_define_class_under(xml, "Node", rb_cObject);
 
   /*

data/ext/nokogiri/xml_xpath_context.c

@@ -83,7 +83,7 @@ static void ruby_funcall(xmlXPathParserContextPtr ctx, int nargs)
     case T_STRING:
       xmlXPathReturnString(
           ctx,
-          xmlXPathWrapCString(StringValuePtr(result))
+          (xmlChar *)xmlXPathWrapCString(StringValuePtr(result))
       );
       break;
     case T_TRUE:
@@ -160,15 +160,14 @@ static VALUE evaluate(int argc, VALUE *argv, VALUE self)
 
   VALUE xpath_object = Nokogiri_wrap_xml_xpath(xpath);
 
-  assert(ctx->node);
-  assert(ctx->node->doc);
-  assert(ctx->node->doc->_private);
+  assert(ctx->doc);
+  assert(ctx->doc->_private);
 
   rb_funcall( xpath_object,
               rb_intern("document="),
               1,
-              (VALUE)ctx->node->doc->_private
-            );
+              (VALUE)ctx->doc->_private
+    );
   return xpath_object;
 }
 

data/lib/nokogiri/css.rb

@@ -5,7 +5,6 @@ require 'nokogiri/css/generated_tokenizer'
 require 'nokogiri/css/tokenizer'
 require 'nokogiri/css/parser'
 require 'nokogiri/css/syntax_error'
-require 'nokogiri/css/selector_handler'
 
 module Nokogiri
   module CSS

data/lib/nokogiri/css/generated_parser.rb

@@ -1,88 +1,16 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by racc 1.4.5
-# from racc grammer file "lib/nokogiri/css/parser.y".
+# This file is automatically generated by Racc 1.4.6
+# from Racc grammer file "".
 #
 
-require 'racc/parser'
+require 'racc/parser.rb'
 
 
 module Nokogiri
-
   module CSS
-
     class GeneratedParser < Racc::Parser
-
-##### racc 1.4.5 generates ###
-
-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,
- 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
+##### State transition tables begin ###
 
 racc_action_table = [
      5,    28,    27,    22,    10,     5,    27,     5,    24,     1,
@@ -170,380 +98,465 @@ racc_goto_default = [
    nil,   nil,   nil,   nil,   nil,    13,    16,   nil,    17,   nil,
      2,     3,     4,   nil,   nil,   nil,    11,    14,    91,   nil ]
 
-racc_token_table = {
- false => 0,
- Object.new => 1,
- :FUNCTION => 2,
- :INCLUDES => 3,
- :DASHMATCH => 4,
- :LBRACE => 5,
- :HASH => 6,
- :PLUS => 7,
- :GREATER => 8,
- :S => 9,
- :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_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,
+  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_use_result_var = true
+racc_reduce_n = 63
+
+racc_shift_n = 105
+
+racc_token_table = {
+  false => 0,
+  :error => 1,
+  :FUNCTION => 2,
+  :INCLUDES => 3,
+  :DASHMATCH => 4,
+  :LBRACE => 5,
+  :HASH => 6,
+  :PLUS => 7,
+  :GREATER => 8,
+  :S => 9,
+  :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
 
+racc_use_result_var = true
+
 Racc_arg = [
- racc_action_table,
- racc_action_check,
- racc_action_default,
- racc_action_pointer,
- racc_goto_table,
- racc_goto_check,
- racc_goto_default,
- racc_goto_pointer,
- racc_nt_base,
- racc_reduce_table,
- racc_token_table,
- racc_shift_n,
- racc_reduce_n,
- racc_use_result_var ]
+  racc_action_table,
+  racc_action_check,
+  racc_action_default,
+  racc_action_pointer,
+  racc_goto_table,
+  racc_goto_check,
+  racc_goto_default,
+  racc_goto_pointer,
+  racc_nt_base,
+  racc_reduce_table,
+  racc_token_table,
+  racc_shift_n,
+  racc_reduce_n,
+  racc_use_result_var ]
 
 Racc_token_to_s_table = [
-'$end',
-'error',
-'FUNCTION',
-'INCLUDES',
-'DASHMATCH',
-'LBRACE',
-'HASH',
-'PLUS',
-'GREATER',
-'S',
-'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',
-'TILDE',
-'NOT_EQUAL',
-'SLASH',
-'DOUBLESLASH',
-'NOT',
-'"."',
-'"*"',
-'"["',
-'"]"',
-'")"',
-'":"',
-'"="',
-'$start',
-'selector',
-'s_0toN',
-'simple_selector_1toN',
-'combinator',
-'simple_selector',
-'element_name',
-'hcap_0toN',
-'hcap_1toN',
-'negation',
-'function',
-'attrib',
-'class',
-'attrib_val_0or1',
-'expr',
-'an_plus_b',
-'pseudo',
-'attribute_id',
-'eql_incl_dash',
-'negation_arg']
+  "$end",
+  "error",
+  "FUNCTION",
+  "INCLUDES",
+  "DASHMATCH",
+  "LBRACE",
+  "HASH",
+  "PLUS",
+  "GREATER",
+  "S",
+  "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",
+  "TILDE",
+  "NOT_EQUAL",
+  "SLASH",
+  "DOUBLESLASH",
+  "NOT",
+  "\".\"",
+  "\"*\"",
+  "\"[\"",
+  "\"]\"",
+  "\")\"",
+  "\":\"",
+  "\"=\"",
+  "$start",
+  "selector",
+  "s_0toN",
+  "simple_selector_1toN",
+  "combinator",
+  "simple_selector",
+  "element_name",
+  "hcap_0toN",
+  "hcap_1toN",
+  "negation",
+  "function",
+  "attrib",
+  "class",
+  "attrib_val_0or1",
+  "expr",
+  "an_plus_b",
+  "pseudo",
+  "attribute_id",
+  "eql_incl_dash",
+  "negation_arg" ]
 
 Racc_debug_parser = false
 
-##### racc system variables end #####
+##### State transition tables end #####
 
- # reduce 0 omitted
+# reduce 0 omitted
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 13
-  def _reduce_1( val, _values, result )
-        result = [val.first, val.last].flatten
-   result
+module_eval(<<'.,.,', 'parser.y', 11)
+  def _reduce_1(val, _values, result)
+            result = [val.first, val.last].flatten
+      
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 13
-  def _reduce_2( val, _values, result )
- result = val.flatten
-   result
+module_eval(<<'.,.,', 'parser.y', 13)
+  def _reduce_2(val, _values, result)
+     result = val.flatten 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 16
-  def _reduce_3( val, _values, result )
- result = :DIRECT_ADJACENT_SELECTOR
-   result
+module_eval(<<'.,.,', 'parser.y', 16)
+  def _reduce_3(val, _values, result)
+     result = :DIRECT_ADJACENT_SELECTOR 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 17
-  def _reduce_4( val, _values, result )
- result = :CHILD_SELECTOR
-   result
+module_eval(<<'.,.,', 'parser.y', 17)
+  def _reduce_4(val, _values, result)
+     result = :CHILD_SELECTOR 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 18
-  def _reduce_5( val, _values, result )
- result = :PRECEDING_SELECTOR
-   result
+module_eval(<<'.,.,', 'parser.y', 18)
+  def _reduce_5(val, _values, result)
+     result = :PRECEDING_SELECTOR 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 19
-  def _reduce_6( val, _values, result )
- result = :DESCENDANT_SELECTOR
-   result
+module_eval(<<'.,.,', 'parser.y', 19)
+  def _reduce_6(val, _values, result)
+     result = :DESCENDANT_SELECTOR 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 20
-  def _reduce_7( val, _values, result )
- result = :DESCENDANT_SELECTOR
-   result
+module_eval(<<'.,.,', 'parser.y', 20)
+  def _reduce_7(val, _values, result)
+     result = :DESCENDANT_SELECTOR 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 21
-  def _reduce_8( val, _values, result )
- result = :CHILD_SELECTOR
-   result
+module_eval(<<'.,.,', 'parser.y', 21)
+  def _reduce_8(val, _values, result)
+     result = :CHILD_SELECTOR 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 31
-  def _reduce_9( val, _values, result )
-        result =  if val[1].nil?
+module_eval(<<'.,.,', 'parser.y', 25)
+  def _reduce_9(val, _values, result)
+            result =  if val[1].nil?
                     val.first
                   else
                     Node.new(:CONDITIONAL_SELECTOR, [val.first, val[1]])
                   end
-   result
+      
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 39
-  def _reduce_10( val, _values, result )
-        result = Node.new(:CONDITIONAL_SELECTOR,
+module_eval(<<'.,.,', 'parser.y', 32)
+  def _reduce_10(val, _values, result)
+            result = Node.new(:CONDITIONAL_SELECTOR,
           [
             val.first,
             Node.new(:COMBINATOR, [val[1], val.last])
           ]
         )
-   result
+      
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 42
-  def _reduce_11( val, _values, result )
-        result = Node.new(:CONDITIONAL_SELECTOR, val)
-   result
+module_eval(<<'.,.,', 'parser.y', 40)
+  def _reduce_11(val, _values, result)
+            result = Node.new(:CONDITIONAL_SELECTOR, val)
+      
+    result
   end
 .,.,
 
- # reduce 12 omitted
+# reduce 12 omitted
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 46
-  def _reduce_13( val, _values, result )
-        result = Node.new(:CONDITIONAL_SELECTOR, val)
-   result
+module_eval(<<'.,.,', 'parser.y', 44)
+  def _reduce_13(val, _values, result)
+            result = Node.new(:CONDITIONAL_SELECTOR, val)
+      
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 54
-  def _reduce_14( val, _values, result )
-        result = Node.new(:CONDITIONAL_SELECTOR,
+module_eval(<<'.,.,', 'parser.y', 47)
+  def _reduce_14(val, _values, result)
+            result = Node.new(:CONDITIONAL_SELECTOR,
           [
             Node.new(:ELEMENT_NAME, ['*']),
             Node.new(:COMBINATOR, val)
           ]
         )
-   result
+      
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 59
-  def _reduce_15( val, _values, result )
-        result = Node.new(:CONDITIONAL_SELECTOR,
+module_eval(<<'.,.,', 'parser.y', 55)
+  def _reduce_15(val, _values, result)
+            result = Node.new(:CONDITIONAL_SELECTOR,
           [Node.new(:ELEMENT_NAME, ['*']), val.first]
         )
-   result
+      
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 64
-  def _reduce_16( val, _values, result )
-        result = Node.new(val[1], [val.first, val.last])
-   result
+module_eval(<<'.,.,', 'parser.y', 62)
+  def _reduce_16(val, _values, result)
+            result = Node.new(val[1], [val.first, val.last])
+      
+    result
   end
 .,.,
 
- # reduce 17 omitted
+# reduce 17 omitted
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 67
-  def _reduce_18( val, _values, result )
- result = Node.new(:CLASS_CONDITION, [val[1]])
-   result
+module_eval(<<'.,.,', 'parser.y', 67)
+  def _reduce_18(val, _values, result)
+     result = Node.new(:CLASS_CONDITION, [val[1]]) 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 70
-  def _reduce_19( val, _values, result )
- result = Node.new(:ELEMENT_NAME, val)
-   result
+module_eval(<<'.,.,', 'parser.y', 70)
+  def _reduce_19(val, _values, result)
+     result = Node.new(:ELEMENT_NAME, val) 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 71
-  def _reduce_20( val, _values, result )
- result = Node.new(:ELEMENT_NAME, val)
-   result
+module_eval(<<'.,.,', 'parser.y', 71)
+  def _reduce_20(val, _values, result)
+     result = Node.new(:ELEMENT_NAME, val) 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 79
-  def _reduce_21( val, _values, result )
-        result = Node.new(:ATTRIBUTE_CONDITION,
+module_eval(<<'.,.,', 'parser.y', 75)
+  def _reduce_21(val, _values, result)
+            result = Node.new(:ATTRIBUTE_CONDITION,
           [Node.new(:ELEMENT_NAME, [val[2]])] + (val[4] || [])
         )
-   result
+      
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 84
-  def _reduce_22( val, _values, result )
-        result = Node.new(:ATTRIBUTE_CONDITION,
+module_eval(<<'.,.,', 'parser.y', 80)
+  def _reduce_22(val, _values, result)
+            result = Node.new(:ATTRIBUTE_CONDITION,
           [val[2]] + (val[4] || [])
         )
-   result
+      
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 90
-  def _reduce_23( val, _values, result )
-        # Non standard, but hpricot supports it.
+module_eval(<<'.,.,', 'parser.y', 85)
+  def _reduce_23(val, _values, result)
+            # Non standard, but hpricot supports it.
         result = Node.new(:PSEUDO_CLASS,
           [Node.new(:FUNCTION, ['nth-child(', val[2]])]
         )
-   result
+      
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 95
-  def _reduce_24( val, _values, result )
-        result = Node.new(:FUNCTION, [val.first.strip])
-   result
+module_eval(<<'.,.,', 'parser.y', 93)
+  def _reduce_24(val, _values, result)
+            result = Node.new(:FUNCTION, [val.first.strip])
+      
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 98
-  def _reduce_25( val, _values, result )
-        result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
-   result
+module_eval(<<'.,.,', 'parser.y', 96)
+  def _reduce_25(val, _values, result)
+            result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
+      
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 101
-  def _reduce_26( val, _values, result )
-        result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
-   result
+module_eval(<<'.,.,', 'parser.y', 99)
+  def _reduce_26(val, _values, result)
+            result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
+      
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 104
-  def _reduce_27( val, _values, result )
-        result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
-   result
+module_eval(<<'.,.,', 'parser.y', 102)
+  def _reduce_27(val, _values, result)
+            result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
+      
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 106
-  def _reduce_28( val, _values, result )
- result = [val.first, val.last]
-   result
+module_eval(<<'.,.,', 'parser.y', 106)
+  def _reduce_28(val, _values, result)
+     result = [val.first, val.last] 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 107
-  def _reduce_29( val, _values, result )
- result = [val.first, val.last]
-   result
+module_eval(<<'.,.,', 'parser.y', 107)
+  def _reduce_29(val, _values, result)
+     result = [val.first, val.last] 
+    result
   end
 .,.,
 
- # reduce 30 omitted
+# reduce 30 omitted
 
- # reduce 31 omitted
+# reduce 31 omitted
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 120
-  def _reduce_32( val, _values, result )
-        if val[1] == 'n'
+module_eval(<<'.,.,', 'parser.y', 114)
+  def _reduce_32(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
-   result
+      
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 131
-  def _reduce_33( val, _values, result )
-               # n+3, -n+3
+module_eval(<<'.,.,', 'parser.y', 120)
+  def _reduce_33(val, _values, result)
+                   # n+3, -n+3
         if val[0] == 'n'
           val.unshift("1")
           result = Node.new(:AN_PLUS_B, val)
@@ -554,26 +567,28 @@ module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 131
         else
           raise Racc::ParseError, "parse error on IDENT '#{val[1]}'"
         end
-   result
+      
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 142
-  def _reduce_34( val, _values, result )
-        if val[1] == 'n'
+module_eval(<<'.,.,', 'parser.y', 134)
+  def _reduce_34(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
+      
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 154
-  def _reduce_35( val, _values, result )
-        if val[0] == 'even'
+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'
@@ -582,120 +597,125 @@ module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 154
         else
           raise Racc::ParseError, "parse error on IDENT '#{val[0]}'"
         end
-   result
+      
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 159
-  def _reduce_36( val, _values, result )
-        result = Node.new(:PSEUDO_CLASS, [val[1]])
-   result
+module_eval(<<'.,.,', 'parser.y', 157)
+  def _reduce_36(val, _values, result)
+            result = Node.new(:PSEUDO_CLASS, [val[1]])
+      
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 159
-  def _reduce_37( val, _values, result )
- result = Node.new(:PSEUDO_CLASS, [val[1]])
-   result
+module_eval(<<'.,.,', 'parser.y', 159)
+  def _reduce_37(val, _values, result)
+     result = Node.new(:PSEUDO_CLASS, [val[1]]) 
+    result
   end
 .,.,
 
- # reduce 38 omitted
+# reduce 38 omitted
 
- # reduce 39 omitted
+# reduce 39 omitted
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 169
-  def _reduce_40( val, _values, result )
-        result = Node.new(:COMBINATOR, val)
-   result
+module_eval(<<'.,.,', 'parser.y', 167)
+  def _reduce_40(val, _values, result)
+            result = Node.new(:COMBINATOR, val)
+      
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 172
-  def _reduce_41( val, _values, result )
-        result = Node.new(:COMBINATOR, val)
-   result
+module_eval(<<'.,.,', 'parser.y', 170)
+  def _reduce_41(val, _values, result)
+            result = Node.new(:COMBINATOR, val)
+      
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 175
-  def _reduce_42( val, _values, result )
-        result = Node.new(:COMBINATOR, val)
-   result
+module_eval(<<'.,.,', 'parser.y', 173)
+  def _reduce_42(val, _values, result)
+            result = Node.new(:COMBINATOR, val)
+      
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 178
-  def _reduce_43( val, _values, result )
-        result = Node.new(:COMBINATOR, val)
-   result
+module_eval(<<'.,.,', 'parser.y', 176)
+  def _reduce_43(val, _values, result)
+            result = Node.new(:COMBINATOR, val)
+      
+    result
   end
 .,.,
 
- # reduce 44 omitted
+# reduce 44 omitted
 
- # reduce 45 omitted
+# reduce 45 omitted
 
- # reduce 46 omitted
+# reduce 46 omitted
 
- # reduce 47 omitted
+# reduce 47 omitted
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 184
-  def _reduce_48( val, _values, result )
- result = Node.new(:ID, val)
-   result
+module_eval(<<'.,.,', 'parser.y', 184)
+  def _reduce_48(val, _values, result)
+     result = Node.new(:ID, val) 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 187
-  def _reduce_49( val, _values, result )
- result = [val.first, val[2]]
-   result
+module_eval(<<'.,.,', 'parser.y', 187)
+  def _reduce_49(val, _values, result)
+     result = [val.first, val[2]] 
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 188
-  def _reduce_50( val, _values, result )
- result = [val.first, val[2]]
-   result
+module_eval(<<'.,.,', 'parser.y', 188)
+  def _reduce_50(val, _values, result)
+     result = [val.first, val[2]] 
+    result
   end
 .,.,
 
- # reduce 51 omitted
+# reduce 51 omitted
 
- # reduce 52 omitted
+# reduce 52 omitted
 
- # reduce 53 omitted
+# reduce 53 omitted
 
- # reduce 54 omitted
+# reduce 54 omitted
 
- # reduce 55 omitted
+# reduce 55 omitted
 
- # reduce 56 omitted
+# reduce 56 omitted
 
- # reduce 57 omitted
+# reduce 57 omitted
 
- # reduce 58 omitted
+# reduce 58 omitted
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 204
-  def _reduce_59( val, _values, result )
-        result = Node.new(:NOT, [val[2]])
-   result
+module_eval(<<'.,.,', 'parser.y', 202)
+  def _reduce_59(val, _values, result)
+            result = Node.new(:NOT, [val[2]])
+      
+    result
   end
 .,.,
 
- # reduce 60 omitted
+# reduce 60 omitted
 
- # reduce 61 omitted
+# reduce 61 omitted
 
- # reduce 62 omitted
+# reduce 62 omitted
 
- def _reduce_none( val, _values, result )
-  result
- end
+def _reduce_none(val, _values, result)
+  val[0]
+end
 
     end   # class GeneratedParser
-
-  end   # module CSS
-
-end   # module Nokogiri
+    end   # module CSS
+  end   # module Nokogiri