nokogiri 1.4.4 → 1.4.5

data/CHANGELOG.ja.rdoc

@@ -1,3 +1,19 @@
+=== 1.4.5 / 未リリース
+
+* 新機能
+
+  * Nokogiri::HTML::Document#title アクセサメソッドでHTML文書のタイトルを読み書きできる
+
+* バグの修正
+
+  * Node#serialize とその仲間達はSaveOptionオブジェクトを受け入れる
+  * Nokogiri::CSS::Parser has-a Nokogiri::CSS::Tokenizer
+  * [JRUBY+FFIのみ] 「弱い参照」はスレッドセーフになった. #355
+  * HTML::SAX::Parserから呼ばれるstart_element()コールバックのattributes引数はHTML::XML::Parserによるエミュレートコールバックと同じく連想配列になった.  rel. #356
+  * HTML::SAX::Parserのparse*()メソッドはXML::SAX::Parser同様に渡されたブロックをコールバックするようになった.
+  * HTMLパーサーのエンコーディング判定をlibxml2の仕様を超えて拡張・改善した. (XML宣言のencodingを認識、非ASCII文字出現後のmetaタグも文字化けを生じずに反映)
+  * Document#remove_namespaces! は名前空間付きの属性に対応した. #396
+
 === 1.4.4 ２０１０年１１月１５日
 
 * 新機能

data/CHANGELOG.rdoc

@@ -1,4 +1,26 @@
-=== 1.4.4 / Unreleased
+=== 1.4.5 / 2011-06-15
+
+* New Features
+
+  * Nokogiri::HTML::Document#title accessor gets and sets the document title.
+  * extracted sets of Node::SaveOptions into Node::SaveOptions::DEFAULT_{X,H,XH}TML (refactor)
+  * Raise an exception if a string is passed to Nokogiri::XML::Schema#validate. #406
+
+* Bugfixes
+
+  * Node#serialize-and-friends now accepts a SaveOption object as the, erm, save object.
+  * Nokogiri::CSS::Parser has-a Nokogiri::CSS::Tokenizer
+  * [JRUBY+FFI only] Weak references are now threadsafe. #355
+  * Make direct start_element() callback (currently used for
+    HTML::SAX::Parser) pass attributes in assoc array, just as
+    emulated start_element() callback does.  rel. #356
+  * HTML::SAX::Parser should call back a block given to parse*() if any, just as XML::SAX::Parser does.
+  * Add further encoding detection to HTML parser that libxml2 does not do.
+  * Document#remove_namespaces! now handles attributes with namespaces. #396
+  * XSLT::Stylesheet#transform no longer segfaults when handed a non-XML::Document. #452
+  * XML::Reader no longer segfaults when under GC pressure. #439
+
+=== 1.4.4 / 2010-11-15
 
 * New Features
 

data/Manifest.txt

@@ -1,4 +1,5 @@
 .autotest
+.gemtest
 CHANGELOG.ja.rdoc
 CHANGELOG.rdoc
 Manifest.txt
@@ -6,7 +7,6 @@ README.ja.rdoc
 README.rdoc
 Rakefile
 bin/nokogiri
-deps.rip
 ext/nokogiri/depend
 ext/nokogiri/extconf.rb
 ext/nokogiri/html_document.c
@@ -77,11 +77,10 @@ ext/nokogiri/xslt_stylesheet.c
 ext/nokogiri/xslt_stylesheet.h
 lib/nokogiri.rb
 lib/nokogiri/css.rb
-lib/nokogiri/css/generated_parser.rb
-lib/nokogiri/css/generated_tokenizer.rb
 lib/nokogiri/css/node.rb
 lib/nokogiri/css/parser.rb
 lib/nokogiri/css/parser.y
+lib/nokogiri/css/parser_extras.rb
 lib/nokogiri/css/syntax_error.rb
 lib/nokogiri/css/tokenizer.rb
 lib/nokogiri/css/tokenizer.rex
@@ -213,6 +212,8 @@ test/files/address_book.rlx
 test/files/address_book.xml
 test/files/bar/bar.xsd
 test/files/dont_hurt_em_why.xml
+test/files/encoding.html
+test/files/encoding.xhtml
 test/files/exslt.xml
 test/files/exslt.xslt
 test/files/foo/foo.xsd

data/Rakefile

@@ -7,12 +7,13 @@ require 'hoe'
 windows = RUBY_PLATFORM =~ /(mswin|mingw)/i
 java    = RUBY_PLATFORM =~ /java/
 
-GENERATED_PARSER    = "lib/nokogiri/css/generated_parser.rb"
-GENERATED_TOKENIZER = "lib/nokogiri/css/generated_tokenizer.rb"
+GENERATED_PARSER    = "lib/nokogiri/css/parser.rb"
+GENERATED_TOKENIZER = "lib/nokogiri/css/tokenizer.rb"
 CROSS_DIR           = File.join(File.dirname(__FILE__), 'tmp', 'cross')
 
 # Make sure hoe-debugging is installed
 Hoe.plugin :debugging
+Hoe.plugin :git
 
 HOE = Hoe.spec 'nokogiri' do
   developer('Aaron Patterson', 'aaronp@rubyforge.org')
@@ -21,18 +22,19 @@ HOE = Hoe.spec 'nokogiri' do
   self.history_file  = ['CHANGELOG', ENV['HLANG'], 'rdoc'].compact.join('.')
   self.extra_rdoc_files  = FileList['*.rdoc','ext/nokogiri/*.c']
   self.clean_globs = [
+    "ext/nokogiri/*.dll",
     'lib/nokogiri/*.{o,so,bundle,a,log,dll}',
     'lib/nokogiri/nokogiri.rb',
     'lib/nokogiri/1.{8,9}',
     GENERATED_PARSER,
     GENERATED_TOKENIZER,
-    'cross',
+    CROSS_DIR
   ]
 
   %w{ racc rexical rake-compiler }.each do |dep|
-    self.extra_dev_deps << [dep, '>= 0']
+    extra_dev_deps << [dep, '>= 0']
   end
-  self.extra_dev_deps << ["minitest", ">= 1.6.0"]
+  extra_dev_deps << ["minitest", ">= 1.6.0"]
 
   self.spec_extras = { :extensions => ["ext/nokogiri/extconf.rb"] }
 
@@ -65,8 +67,7 @@ unless java
 
     ext.config_options << ENV['EXTOPTS']
     ext.cross_compile   = true
-    ext.cross_platform  = 'i386-mingw32'
-    # ext.cross_platform  = 'i386-mswin32'
+    ext.cross_platform = ["x86-mingw32", "x86-mswin32-60"]
     ext.cross_config_options <<
       "--with-xml2-include=#{File.join(CROSS_DIR, 'include', 'libxml2')}"
     ext.cross_config_options <<
@@ -89,13 +90,14 @@ namespace :gem do
 
   desc "Build a gem targetted for JRuby"
   task :jruby => ['gem:jruby:spec'] do
+    raise "ERROR: please run this task under jruby" unless java
     system "gem build nokogiri.gemspec"
     FileUtils.mkdir_p "pkg"
     FileUtils.mv Dir.glob("nokogiri*-java.gem"), "pkg"
   end
 
   namespace :jruby do
-    task :spec => [GENERATED_PARSER, GENERATED_TOKENIZER] do
+    task :spec => [GENERATED_PARSER, GENERATED_TOKENIZER, :"gem:jruby:dlls"] do
       File.open("#{HOE.name}.gemspec", 'w') do |f|
         HOE.spec.platform = 'java'
         HOE.spec.files << GENERATED_PARSER
@@ -106,27 +108,45 @@ namespace :gem do
         f.write(HOE.spec.to_ruby)
       end
     end
+
+    task :dlls do
+      def run cmd
+        puts(cmd) || system(cmd) || raise("command failed")
+      end
+
+      dlldir = "tmp/dlls"
+      FileUtils.mkdir_p dlldir
+      Dir.chdir dlldir do
+        unless File.exists? "nokogiri-1.4.3.1-java.gem"
+          run "wget http://rubygems.org/downloads/nokogiri-1.4.3.1-java.gem"
+        end
+        unless File.exists? "data.tar.gz"
+          run "tar -xf nokogiri-1.4.3.1-java.gem"
+        end
+        FileUtils.rm_rf "unpack"
+        FileUtils.mkdir "unpack"
+        Dir.chdir "unpack" do
+          run "tar -zxf ../data.tar.gz"
+        end
+      end
+
+      Dir["#{dlldir}/unpack/ext/nokogiri/*.dll"].each do |file|
+        cp file, "ext/nokogiri"
+      end
+    end
   end
 
   task :spec => ['gem:dev:spec']
 end
 
 file GENERATED_PARSER => "lib/nokogiri/css/parser.y" do |t|
-  begin
-    racc = Config::CONFIG['target_os'] =~ /mswin32/ ? '' : `which racc`.strip
-    racc = "#{::Config::CONFIG['bindir']}/racc" if racc.empty?
-    sh "#{racc} -l -o #{t.name} #{t.prerequisites.first}"
-  rescue
-    abort "need racc, sudo gem install racc"
-  end
+  racc = Config::CONFIG['target_os'] =~ /mswin32/ ? '' : `which racc`.strip
+  racc = "#{::Config::CONFIG['bindir']}/racc" if racc.empty?
+  sh "#{racc} -l -o #{t.name} #{t.prerequisites.first}"
 end
 
 file GENERATED_TOKENIZER => "lib/nokogiri/css/tokenizer.rex" do |t|
-  begin
-    sh "rex --independent -o #{t.name} #{t.prerequisites.first}"
-  rescue
-    abort "need rexical, sudo gem install rexical"
-  end
+  sh "rex --independent -o #{t.name} #{t.prerequisites.first}"
 end
 
 require 'tasks/test'
@@ -153,6 +173,7 @@ unless windows || java || ENV['NOKOGIRI_FFI']
   end
 
   Rake::Task[:test].prerequisites << :compile
+  Rake::Task[:test].prerequisites << :check_extra_deps
   if Hoe.plugins.include?(:debugging)
     ['valgrind', 'valgrind:mem', 'valgrind:mem0'].each do |task_name|
       Rake::Task["test:#{task_name}"].prerequisites << :compile
@@ -167,21 +188,4 @@ else
   end
 end
 
-namespace :install do
-  desc "Install rex and racc for development"
-  task :deps => %w(rexical racc)
-
-  task :racc do |t|
-    sh "sudo gem install racc"
-  end
-
-  task :rexical do
-    sh "sudo gem install rexical"
-  end
-end
-
-namespace :rip do
-  task :install => [GENERATED_TOKENIZER, GENERATED_PARSER]
-end
-
 # vim: syntax=Ruby

data/ext/nokogiri/xml_document.c

@@ -41,6 +41,7 @@ static void dealloc(xmlDocPtr doc)
 static void recursively_remove_namespaces_from_node(xmlNodePtr node)
 {
   xmlNodePtr child ;
+  xmlAttrPtr property ;
 
   xmlSetNs(node, NULL);
 
@@ -51,6 +52,14 @@ static void recursively_remove_namespaces_from_node(xmlNodePtr node)
     xmlFreeNsList(node->nsDef);
     node->nsDef = NULL;
   }
+
+  if (node->properties != NULL) {
+    property = node->properties ;
+    while (property != NULL) {
+      if (property->ns) property->ns = NULL ;
+      property = property->next ;
+    }
+  }
 }
 
 /*

data/ext/nokogiri/xml_io.c

@@ -2,22 +2,47 @@
 
 static ID id_read, id_write;
 
+VALUE read_check(VALUE *args) {
+  return rb_funcall(args[0], id_read, 1, args[1]);
+}
+
+VALUE read_failed(void) {
+	return Qnil;
+}
+
 int io_read_callback(void * ctx, char * buffer, int len) {
-  VALUE io = (VALUE)ctx;
-  VALUE string = rb_funcall(io, id_read, 1, INT2NUM(len));
+  VALUE string, args[2];
+  size_t str_len, safe_len;
+
+  args[0] = (VALUE)ctx;
+  args[1] = INT2NUM(len);
+
+  string = rb_rescue(read_check, (VALUE)args, read_failed, 0);
 
   if(NIL_P(string)) return 0;
 
-  memcpy(buffer, StringValuePtr(string), (size_t)RSTRING_LEN(string));
+  str_len = (size_t)RSTRING_LEN(string);
+  safe_len = str_len > (size_t)len ? (size_t)len : str_len;
+  memcpy(buffer, StringValuePtr(string), safe_len);
 
-  return (int)RSTRING_LEN(string);
+  return safe_len;
+}
+
+VALUE write_check(VALUE *args) {
+  return rb_funcall(args[0], id_write, 1, args[1]);
+}
+
+VALUE write_failed(void) {
+	return Qnil;
 }
 
 int io_write_callback(void * ctx, char * buffer, int len) {
-  VALUE io = (VALUE)ctx;
-  VALUE string = rb_str_new(buffer, (long)len);
+  VALUE args[2];
+
+  args[0] = (VALUE)ctx;
+  args[1] = rb_str_new(buffer, (long)len);
 
-  rb_funcall(io, id_write, 1, string);
+  rb_rescue(write_check, (VALUE)args, write_failed, 0);
   return len;
 }
 

data/ext/nokogiri/xml_node.c

@@ -14,10 +14,7 @@ static void debug_node_dealloc(xmlNodePtr x)
 
 static void mark(xmlNodePtr node)
 {
-  /* it's OK if the document isn't fully realized (as in XML::Reader). */
-  /* see http://github.com/tenderlove/nokogiri/issues/closed/#issue/95 */
-  if (DOC_RUBY_OBJECT_TEST(node->doc) && DOC_RUBY_OBJECT(node->doc))
-    rb_gc_mark(DOC_RUBY_OBJECT(node->doc));
+  rb_gc_mark(DOC_RUBY_OBJECT(node->doc));
 }
 
 /* :nodoc: */
@@ -1241,6 +1238,8 @@ VALUE Nokogiri_wrap_xml_node(VALUE klass, xmlNodePtr node)
   VALUE document = Qnil ;
   VALUE node_cache = Qnil ;
   VALUE rb_node = Qnil ;
+  int node_has_a_document = 0 ;
+  void (*mark_method)(xmlNodePtr) = NULL ;
 
   assert(node);
 
@@ -1249,11 +1248,9 @@ VALUE Nokogiri_wrap_xml_node(VALUE klass, xmlNodePtr node)
 
   if(NULL != node->_private) return (VALUE)node->_private;
 
-  if(RTEST(klass))
-    rb_node = Data_Wrap_Struct(klass, mark, debug_node_dealloc, node) ;
-
-  else switch(node->type)
-  {
+  if(!RTEST(klass)) {
+    switch(node->type)
+    {
     case XML_ELEMENT_NODE:
       klass = cNokogiriXmlElement;
       break;
@@ -1292,15 +1289,19 @@ VALUE Nokogiri_wrap_xml_node(VALUE klass, xmlNodePtr node)
       break;
     default:
       klass = cNokogiriXmlNode;
+    }
   }
 
-  rb_node = Data_Wrap_Struct(klass, mark, debug_node_dealloc, node) ;
+  /* It's OK if the node doesn't have a fully-realized document (as in XML::Reader). */
+  /* see https://github.com/tenderlove/nokogiri/issues/95 */
+  /* and https://github.com/tenderlove/nokogiri/issues/439 */
+  node_has_a_document = (DOC_RUBY_OBJECT_TEST(node->doc) && DOC_RUBY_OBJECT(node->doc)) ? 1 : 0 ;
+  mark_method = node_has_a_document ? mark : NULL ;
 
+  rb_node = Data_Wrap_Struct(klass, mark_method, debug_node_dealloc, node) ;
   node->_private = (void *)rb_node;
 
-  if (DOC_RUBY_OBJECT_TEST(node->doc) && DOC_RUBY_OBJECT(node->doc)) {
-    /* it's OK if the document isn't fully realized (as in XML::Reader). */
-    /* see http://github.com/tenderlove/nokogiri/issues/closed/#issue/95 */
+  if (node_has_a_document) {
     document = DOC_RUBY_OBJECT(node->doc);
     node_cache = DOC_NODE_CACHE(node->doc);
     rb_ary_push(node_cache, rb_node);

data/ext/nokogiri/xml_sax_parser.c

@@ -62,8 +62,10 @@ static void start_element(void * ctx, const xmlChar *name, const xmlChar **atts)
   int i = 0;
   if(atts) {
     while((attr = atts[i]) != NULL) {
-      rb_ary_push(attributes, NOKOGIRI_STR_NEW2(attr));
-      i++;
+      const xmlChar * val = atts[i+1];
+      VALUE value = val != NULL ? NOKOGIRI_STR_NEW2(val) : Qnil;
+      rb_ary_push(attributes, rb_ary_new3(2, NOKOGIRI_STR_NEW2(attr), value));
+      i+=2;
     }
   }
 

data/ext/nokogiri/xslt_stylesheet.c

@@ -100,6 +100,8 @@ static VALUE transform(int argc, VALUE* argv, VALUE self)
 
     rb_scan_args(argc, argv, "11", &xmldoc, &paramobj);
     if (NIL_P(paramobj)) { paramobj = rb_ary_new2(0L) ; }
+    if (!rb_obj_is_kind_of(xmldoc, cNokogiriXmlDocument))
+      rb_raise(rb_eArgError, "argument must be a Nokogiri::XML::Document");
 
     /* handle hashes as arguments. */
     if(T_HASH == TYPE(paramobj)) {
@@ -139,6 +141,7 @@ static void method_caller(xmlXPathParserContextPtr ctxt, int nargs)
     xmlXPathObjectPtr xpath;
     VALUE obj;
     VALUE *args;
+    VALUE result;
 
     transform = xsltXPathGetTransformContext(ctxt);
 
@@ -172,7 +175,7 @@ static void method_caller(xmlXPathParserContextPtr ctxt, int nargs)
 	}
 	args[i] = thing;
     }
-    VALUE result = rb_funcall3(obj, rb_intern((const char *)function), (int)count, args);
+    result = rb_funcall3(obj, rb_intern((const char *)function), (int)count, args);
     switch(TYPE(result)) {
 	case T_FLOAT:
 	case T_BIGNUM:
@@ -239,9 +242,12 @@ static VALUE registr(VALUE self, VALUE uri, VALUE obj)
 VALUE cNokogiriXsltStylesheet ;
 void init_xslt_stylesheet()
 {
-  VALUE nokogiri = rb_define_module("Nokogiri");
+  VALUE nokogiri;
+  VALUE klass;
+
+  nokogiri = rb_define_module("Nokogiri");
   xslt = rb_define_module_under(nokogiri, "XSLT");
-  VALUE klass = rb_define_class_under(xslt, "Stylesheet", rb_cObject);
+  klass = rb_define_class_under(xslt, "Stylesheet", rb_cObject);
 
   rb_iv_set(xslt, "@modules", rb_hash_new());
 

data/lib/nokogiri/css.rb

@@ -1,9 +1,12 @@
 require 'nokogiri/css/node'
 require 'nokogiri/css/xpath_visitor'
-require 'nokogiri/css/generated_parser'
-require 'nokogiri/css/generated_tokenizer'
-require 'nokogiri/css/tokenizer'
+
+x = $-w
+$-w = false
 require 'nokogiri/css/parser'
+$-w = x
+
+require 'nokogiri/css/tokenizer'
 require 'nokogiri/css/syntax_error'
 
 module Nokogiri

data/lib/nokogiri/css/parser.rb

@@ -1,82 +1,677 @@
-require 'thread'
+#
+# DO NOT MODIFY!!!!
+# This file is automatically generated by Racc 1.4.6
+# from Racc grammer file "".
+#
 
+require 'racc/parser.rb'
+
+
+require 'nokogiri/css/parser_extras'
 module Nokogiri
   module CSS
-    class Parser < GeneratedTokenizer
-      @cache_on = true
-      @cache    = {}
-      @mutex    = Mutex.new
-
-      class << self
-        # Turn on CSS parse caching
-        attr_accessor :cache_on
-        alias :cache_on? :cache_on
-        alias :set_cache :cache_on=
-
-        # Get the css selector in +string+ from the cache
-        def [] string
-          return unless @cache_on
-          @mutex.synchronize { @cache[string] }
-        end
+    class Parser < Racc::Parser
+##### State transition tables begin ###
+
+racc_action_table = [
+     4,    56,    27,    22,    12,    24,    57,     4,    65,     1,
+    41,    12,    75,    57,     4,    23,     1,    82,    12,    19,
+    93,    92,     5,     1,     9,    10,    19,    13,    16,     5,
+    12,     9,    10,    19,    13,    16,     5,     5,     9,    10,
+     4,    13,    16,    16,    12,    41,    64,     4,     5,     1,
+    60,    10,    12,    59,    16,    59,    28,     1,    29,    19,
+    12,    12,     5,    62,     9,    10,    19,    13,    16,    12,
+     5,     9,    83,    10,    12,    13,    16,    84,     5,     5,
+    63,    10,    10,    12,    16,    16,    58,     5,    61,    62,
+    10,     4,     5,    16,    87,    10,    27,    53,    16,    54,
+    49,     5,    88,    41,    10,    68,    70,    16,    27,    53,
+    19,    54,    44,    91,    21,     9,    69,    71,    72,    94,
+    74,    68,    70,   -23,    66,    33,    35,    37,    27,    53,
+    96,    54,    69,    71,    72,    32,    74,    34,    36,    97,
+    66,    27,    53,   nil,    54 ]
+
+racc_action_check = [
+     0,    20,     4,     4,     0,     4,    43,     9,    27,     0,
+    39,     9,    29,    20,    31,     4,     9,    43,    31,     0,
+    73,    73,     0,    31,     0,     0,     9,     0,     0,     9,
+     7,     9,     9,    31,     9,     9,    31,    14,    31,    31,
+    57,    31,    31,    14,    57,     7,    26,     5,     7,    57,
+    22,     7,    41,    53,     7,    22,     5,    41,     5,    57,
+     8,    79,    57,    54,    57,    57,     5,    57,    57,    18,
+    41,     5,    55,    41,    17,    41,    41,    56,     8,    79,
+    25,     8,    79,    15,     8,    79,    21,    18,    24,    24,
+    18,    16,    17,    18,    60,    17,    59,    59,    17,    59,
+    16,    15,    61,    11,    15,    30,    30,    15,    19,    19,
+    16,    19,    10,    67,     2,    16,    30,    30,    30,    76,
+    30,    28,    28,     1,    30,     6,     6,     6,    62,    62,
+    81,    62,    28,    28,    28,     6,    28,     6,     6,    88,
+    28,    65,    65,   nil,    65 ]
+
+racc_action_pointer = [
+    -2,    95,    86,   nil,    -8,    45,   118,    24,    54,     5,
+   101,    82,   nil,   nil,    13,    77,    89,    68,    63,    98,
+     1,    75,    43,   nil,    77,    57,    23,    -4,   118,   -13,
+   102,    12,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   -11,
+   nil,    46,   nil,    -6,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    41,    51,    49,    77,    38,   nil,    86,
+    81,    95,   118,   nil,   nil,   131,   nil,    88,   nil,   nil,
+   nil,   nil,   nil,    10,   nil,   nil,    94,   nil,   nil,    55,
+   nil,   107,   nil,   nil,   nil,   nil,   nil,   nil,   126,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil ]
+
+racc_action_default = [
+   -24,   -21,   -69,    -2,   -69,   -69,   -18,   -45,   -50,   -24,
+   -69,   -16,   -54,   -22,   -12,   -53,   -69,   -52,   -51,   -69,
+   -69,   -69,   -38,   -28,   -36,   -69,   -69,   -37,   -57,   -69,
+   -57,   -24,    -5,    -3,    -8,    -4,    -7,    -6,    -9,   -44,
+   -11,   -24,   -46,   -69,   -19,   -15,   -13,   -14,   -49,   -43,
+   -42,   -48,   -47,   -38,   -36,   -69,   -69,   -24,   -20,   -69,
+   -69,   -41,   -69,   -29,   -30,   -69,   -58,   -69,   -63,   -59,
+   -64,   -60,   -61,   -69,   -62,   -27,   -69,   -17,   -10,   -66,
+   -68,   -69,   -32,   -31,    98,    -1,   -35,   -40,   -69,   -33,
+   -34,   -25,   -55,   -56,   -26,   -67,   -65,   -39 ]
+
+racc_goto_table = [
+    39,    42,    25,    40,    77,    30,    20,    45,    48,    79,
+    51,    52,    67,    46,    76,    43,    50,    55,    47,    38,
+    31,    26,    81,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    85,   nil,   nil,   nil,    80,    78,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    86,   nil,   nil,
+    89,   nil,   nil,    90,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    95 ]
+
+racc_goto_check = [
+     7,     7,    15,     8,     2,     9,     1,     8,     7,     5,
+     7,     7,    14,    10,    14,     1,     9,    15,    11,     6,
+     3,    16,    19,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+     2,   nil,   nil,   nil,     7,     8,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    15,   nil,   nil,
+    15,   nil,   nil,    15,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,     7 ]
+
+racc_goto_pointer = [
+   nil,     6,   -27,    14,   nil,   -32,    12,    -7,    -4,     0,
+    -1,     4,   nil,   nil,   -16,    -2,    17,   nil,   nil,   -19 ]
+
+racc_goto_default = [
+   nil,   nil,     3,   nil,     6,     7,   nil,    11,   nil,    14,
+    15,    17,    18,     2,   nil,   nil,   nil,     8,    73,   nil ]
+
+racc_reduce_table = [
+  0, 0, :racc_error,
+  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,
+  2, 35, :_reduce_15,
+  1, 35, :_reduce_16,
+  3, 33, :_reduce_17,
+  1, 33, :_reduce_none,
+  2, 43, :_reduce_19,
+  3, 36, :_reduce_20,
+  1, 36, :_reduce_21,
+  1, 36, :_reduce_22,
+  1, 44, :_reduce_23,
+  0, 44, :_reduce_none,
+  4, 42, :_reduce_25,
+  4, 42, :_reduce_26,
+  3, 42, :_reduce_27,
+  2, 40, :_reduce_28,
+  3, 40, :_reduce_29,
+  3, 40, :_reduce_30,
+  3, 40, :_reduce_31,
+  3, 40, :_reduce_32,
+  3, 46, :_reduce_33,
+  3, 46, :_reduce_34,
+  3, 46, :_reduce_35,
+  1, 46, :_reduce_none,
+  1, 46, :_reduce_none,
+  1, 46, :_reduce_38,
+  4, 47, :_reduce_39,
+  3, 47, :_reduce_40,
+  2, 47, :_reduce_41,
+  2, 41, :_reduce_42,
+  2, 41, :_reduce_43,
+  1, 37, :_reduce_none,
+  0, 37, :_reduce_none,
+  2, 38, :_reduce_46,
+  2, 38, :_reduce_47,
+  2, 38, :_reduce_48,
+  2, 38, :_reduce_49,
+  1, 38, :_reduce_none,
+  1, 38, :_reduce_none,
+  1, 38, :_reduce_none,
+  1, 38, :_reduce_none,
+  1, 48, :_reduce_54,
+  2, 45, :_reduce_55,
+  2, 45, :_reduce_56,
+  0, 45, :_reduce_none,
+  1, 49, :_reduce_58,
+  1, 49, :_reduce_59,
+  1, 49, :_reduce_60,
+  1, 49, :_reduce_61,
+  1, 49, :_reduce_62,
+  1, 49, :_reduce_63,
+  1, 49, :_reduce_64,
+  3, 39, :_reduce_65,
+  1, 50, :_reduce_none,
+  2, 50, :_reduce_none,
+  1, 50, :_reduce_none ]
+
+racc_reduce_n = 69
+
+racc_shift_n = 98
+
+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,
+  :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,
+  :HAS => 26,
+  "." => 27,
+  "|" => 28,
+  "*" => 29,
+  ":" => 30 }
+
+racc_nt_base = 31
+
+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_token_to_s_table = [
+  "$end",
+  "error",
+  "FUNCTION",
+  "INCLUDES",
+  "DASHMATCH",
+  "LBRACE",
+  "HASH",
+  "PLUS",
+  "GREATER",
+  "S",
+  "STRING",
+  "IDENT",
+  "COMMA",
+  "NUMBER",
+  "PREFIXMATCH",
+  "SUFFIXMATCH",
+  "SUBSTRINGMATCH",
+  "TILDE",
+  "NOT_EQUAL",
+  "SLASH",
+  "DOUBLESLASH",
+  "NOT",
+  "EQUAL",
+  "RPAREN",
+  "LSQUARE",
+  "RSQUARE",
+  "HAS",
+  "\".\"",
+  "\"|\"",
+  "\"*\"",
+  "\":\"",
+  "$start",
+  "selector",
+  "simple_selector_1toN",
+  "combinator",
+  "simple_selector",
+  "element_name",
+  "hcap_0toN",
+  "hcap_1toN",
+  "negation",
+  "function",
+  "pseudo",
+  "attrib",
+  "class",
+  "namespace",
+  "attrib_val_0or1",
+  "expr",
+  "an_plus_b",
+  "attribute_id",
+  "eql_incl_dash",
+  "negation_arg" ]
+
+Racc_debug_parser = false
+
+##### State transition tables end #####
+
+# reduce 0 omitted
+
+def _reduce_1(val, _values, result)
+        result = [val.first, val.last].flatten
+      
+    result
+end
+
+def _reduce_2(val, _values, result)
+ result = val.flatten 
+    result
+end
+
+def _reduce_3(val, _values, result)
+ result = :DIRECT_ADJACENT_SELECTOR 
+    result
+end
+
+def _reduce_4(val, _values, result)
+ result = :CHILD_SELECTOR 
+    result
+end
+
+def _reduce_5(val, _values, result)
+ result = :PRECEDING_SELECTOR 
+    result
+end
+
+def _reduce_6(val, _values, result)
+ result = :DESCENDANT_SELECTOR 
+    result
+end
+
+def _reduce_7(val, _values, result)
+ result = :DESCENDANT_SELECTOR 
+    result
+end
+
+def _reduce_8(val, _values, result)
+ result = :CHILD_SELECTOR 
+    result
+end
+
+def _reduce_9(val, _values, result)
+        result =  if val[1].nil?
+                    val.first
+                  else
+                    Node.new(:CONDITIONAL_SELECTOR, [val.first, val[1]])
+                  end
+      
+    result
+end
+
+def _reduce_10(val, _values, result)
+        result = Node.new(:CONDITIONAL_SELECTOR,
+          [
+            val.first,
+            Node.new(:COMBINATOR, [val[1], val.last])
+          ]
+        )
+      
+    result
+end
+
+def _reduce_11(val, _values, result)
+        result = Node.new(:CONDITIONAL_SELECTOR, val)
+      
+    result
+end
+
+# reduce 12 omitted
+
+def _reduce_13(val, _values, result)
+        result = Node.new(:CONDITIONAL_SELECTOR, val)
+      
+    result
+end
+
+def _reduce_14(val, _values, result)
+        result = Node.new(:CONDITIONAL_SELECTOR, val)
+      
+    result
+end
+
+def _reduce_15(val, _values, result)
+        result = Node.new(:CONDITIONAL_SELECTOR,
+          [
+            Node.new(:ELEMENT_NAME, ['*']),
+            Node.new(:COMBINATOR, val)
+          ]
+        )
+      
+    result
+end
+
+def _reduce_16(val, _values, result)
+        result = Node.new(:CONDITIONAL_SELECTOR,
+          [Node.new(:ELEMENT_NAME, ['*']), val.first]
+        )
+      
+    result
+end
+
+def _reduce_17(val, _values, result)
+        result = Node.new(val[1], [val.first, val.last])
+      
+    result
+end
+
+# reduce 18 omitted
+
+def _reduce_19(val, _values, result)
+ result = Node.new(:CLASS_CONDITION, [val[1]]) 
+    result
+end
+
+def _reduce_20(val, _values, result)
+        result = Node.new(:ELEMENT_NAME,
+          [[val.first, val.last].compact.join(':')]
+        )
+      
+    result
+end
+
+def _reduce_21(val, _values, result)
+        name = @namespaces.key?('xmlns') ? "xmlns:#{val.first}" : val.first
+        result = Node.new(:ELEMENT_NAME, [name])
+      
+    result
+end
+
+def _reduce_22(val, _values, result)
+ result = Node.new(:ELEMENT_NAME, val) 
+    result
+end
+
+def _reduce_23(val, _values, result)
+ result = val[0] 
+    result
+end
+
+# reduce 24 omitted
+
+def _reduce_25(val, _values, result)
+        result = Node.new(:ATTRIBUTE_CONDITION,
+          [Node.new(:ELEMENT_NAME, [val[1]])] + (val[2] || [])
+        )
+      
+    result
+end
+
+def _reduce_26(val, _values, result)
+        result = Node.new(:ATTRIBUTE_CONDITION,
+          [val[1]] + (val[2] || [])
+        )
+      
+    result
+end
 
-        # Set the css selector in +string+ in the cache to +value+
-        def []= string, value
-          return value unless @cache_on
-          @mutex.synchronize { @cache[string] = value }
+def _reduce_27(val, _values, result)
+        # Non standard, but hpricot supports it.
+        result = Node.new(:PSEUDO_CLASS,
+          [Node.new(:FUNCTION, ['nth-child(', val[1]])]
+        )
+      
+    result
+end
+
+def _reduce_28(val, _values, result)
+        result = Node.new(:FUNCTION, [val.first.strip])
+      
+    result
+end
+
+def _reduce_29(val, _values, result)
+        result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
+      
+    result
+end
+
+def _reduce_30(val, _values, result)
+        result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
+      
+    result
+end
+
+def _reduce_31(val, _values, result)
+        result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
+      
+    result
+end
+
+def _reduce_32(val, _values, result)
+        result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
+      
+    result
+end
+
+def _reduce_33(val, _values, result)
+ result = [val.first, val.last] 
+    result
+end
+
+def _reduce_34(val, _values, result)
+ result = [val.first, val.last] 
+    result
+end
+
+def _reduce_35(val, _values, result)
+ result = [val.first, val.last] 
+    result
+end
+
+# reduce 36 omitted
+
+# reduce 37 omitted
+
+def _reduce_38(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
 
-        # Clear the cache
-        def clear_cache
-          @mutex.synchronize { @cache = {} }
+def _reduce_39(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
+end
 
-        # Execute +block+ without cache
-        def without_cache &block
-          tmp = @cache_on
-          @cache_on = false
-          block.call
-          @cache_on = tmp
+def _reduce_40(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
 
-        ###
-        # Parse this CSS selector in +selector+.  Returns an AST.
-        def parse selector
-          @warned ||= false
-          unless @warned
-            $stderr.puts('Nokogiri::CSS::Parser.parse is deprecated, call Nokogiri::CSS.parse(), this will be removed August 1st or version 1.4.0 (whichever is first)')
-            @warned = true
-          end
-          new.parse selector
+def _reduce_41(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
-      end
-
-      # Create a new CSS parser with respect to +namespaces+
-      def initialize namespaces = {}
-        @namespaces = namespaces
-        super()
-      end
-      alias :parse :scan_str
-
-      # Get the xpath for +string+ using +options+
-      def xpath_for string, options={}
-        key = "#{string}#{options[:ns]}#{options[:prefix]}"
-        v = self.class[key]
-        return v if v
-
-        args = [
-          options[:prefix] || '//',
-          options[:visitor] || XPathVisitor.new
-        ]
-        self.class[key] = parse(string).map { |ast|
-          ast.to_xpath(*args)
-        }
-      end
-
-      # On CSS parser error, raise an exception
-      def on_error error_token_id, error_value, value_stack
-        after = value_stack.compact.last
-        raise SyntaxError.new("unexpected '#{error_value}' after '#{after}'")
-      end
-    end
-  end
+      
+    result
+end
+
+def _reduce_42(val, _values, result)
+        result = Node.new(:PSEUDO_CLASS, [val[1]])
+      
+    result
+end
+
+def _reduce_43(val, _values, result)
+ result = Node.new(:PSEUDO_CLASS, [val[1]]) 
+    result
+end
+
+# reduce 44 omitted
+
+# reduce 45 omitted
+
+def _reduce_46(val, _values, result)
+        result = Node.new(:COMBINATOR, val)
+      
+    result
+end
+
+def _reduce_47(val, _values, result)
+        result = Node.new(:COMBINATOR, val)
+      
+    result
+end
+
+def _reduce_48(val, _values, result)
+        result = Node.new(:COMBINATOR, val)
+      
+    result
 end
+
+def _reduce_49(val, _values, result)
+        result = Node.new(:COMBINATOR, val)
+      
+    result
+end
+
+# reduce 50 omitted
+
+# reduce 51 omitted
+
+# reduce 52 omitted
+
+# reduce 53 omitted
+
+def _reduce_54(val, _values, result)
+ result = Node.new(:ID, val) 
+    result
+end
+
+def _reduce_55(val, _values, result)
+ result = [val.first, val[1]] 
+    result
+end
+
+def _reduce_56(val, _values, result)
+ result = [val.first, val[1]] 
+    result
+end
+
+# reduce 57 omitted
+
+def _reduce_58(val, _values, result)
+ result = :equal 
+    result
+end
+
+def _reduce_59(val, _values, result)
+ result = :prefix_match 
+    result
+end
+
+def _reduce_60(val, _values, result)
+ result = :suffix_match 
+    result
+end
+
+def _reduce_61(val, _values, result)
+ result = :substring_match 
+    result
+end
+
+def _reduce_62(val, _values, result)
+ result = :not_equal 
+    result
+end
+
+def _reduce_63(val, _values, result)
+ result = :includes 
+    result
+end
+
+def _reduce_64(val, _values, result)
+ result = :dash_match 
+    result
+end
+
+def _reduce_65(val, _values, result)
+        result = Node.new(:NOT, [val[1]])
+      
+    result
+end
+
+# reduce 66 omitted
+
+# reduce 67 omitted
+
+# reduce 68 omitted
+
+def _reduce_none(val, _values, result)
+  val[0]
+end
+
+    end   # class Parser
+    end   # module CSS
+  end   # module Nokogiri