parser has-a tokenizer

mkristian · Dec 9, 2010 · 702affb · 702affb
1 parent 68e807a
commit 702affb
Show file tree

Hide file tree

Showing 10 changed files with 770 additions and 83 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,8 +2,8 @@
 *.tmproj
 ext/nokogiri/*.dll
 lib/nokogiri/nokogiri.so
-lib/nokogiri/css/generated_parser.rb
-lib/nokogiri/css/generated_tokenizer.rb
+lib/nokogiri/css/parser.rb
+lib/nokogiri/css/tokenizer.rb
 cross
 tags
 *.rbc

diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
@@ -3,6 +3,7 @@
 * Bugfixes
 
   * Node#serialize-and-friends now accepts a SaveOption object as the, erm, save object.
+  * Nokogiri::CSS::Parser has-a Nokogiri::CSS::Tokenizer
 
 === 1.4.4 / 2010-11-15
 

diff --git a/Manifest.txt b/Manifest.txt
@@ -77,12 +77,12 @@ 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
 lib/nokogiri/css/xpath_visitor.rb
 lib/nokogiri/decorators/slop.rb

diff --git a/Rakefile b/Rakefile
@@ -7,8 +7,8 @@ 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

diff --git a/lib/nokogiri/css.rb b/lib/nokogiri/css.rb
@@ -1,9 +1,7 @@
 require 'nokogiri/css/node'
 require 'nokogiri/css/xpath_visitor'
-require 'nokogiri/css/generated_parser'
-require 'nokogiri/css/generated_tokenizer'
-require 'nokogiri/css/tokenizer'
 require 'nokogiri/css/parser'
+require 'nokogiri/css/tokenizer'
 require 'nokogiri/css/syntax_error'
 
 module Nokogiri