csspool 0.2.5 → 0.2.6

data/CHANGELOG.txt

@@ -1,3 +1,7 @@
+== 0.2.6
+
+* Fix comment greediness. [Seth Rasmussen]
+
 == 0.2.5
 
 * Accepting spaces after error rules.

data/Rakefile

@@ -7,7 +7,7 @@ $LOAD_PATH.unshift File.join(File.dirname(__FILE__), "lib")
 GENERATED_PARSER = "lib/css/sac/generated_parser.rb"
 GENERATED_PROPERTY_PARSER = "lib/css/sac/generated_property_parser.rb"
 
-Hoe.new('csspool', "0.2.5") do |p|
+Hoe.new('csspool', "0.2.6") do |p|
   p.rubyforge_name  = 'csspool'
   p.author          = 'Aaron Patterson'
   p.email           = 'aaronp@rubyforge.org'

data/lib/css/sac/generated_parser.rb

@@ -17,10 +17,10 @@ module CSS
 
     class GeneratedParser < Racc::Parser
 
-module_eval <<'..end lib/parser.y modeval..idf748a5688a', 'lib/parser.y', 307
+module_eval <<'..end lib/parser.y modeval..id1128ccb808', 'lib/parser.y', 307
   include CSS::SAC::Conditions
   include CSS::SAC::Selectors
-..end lib/parser.y modeval..idf748a5688a
+..end lib/parser.y modeval..id1128ccb808
 
 ##### racc 1.4.5 generates ###
 

data/lib/css/sac/parser.rb

@@ -14,7 +14,7 @@ module CSS
   module SAC
     class Parser < CSS::SAC::GeneratedParser
       # The version of CSSPool you're using
-      VERSION = '0.2.5'
+      VERSION = '0.2.6'
 
       TOKENIZER = Tokenizer.new
       

data/lib/css/sac/tokenizer.rb

@@ -119,8 +119,9 @@ module CSS
         tokens = []
         pos = 0
 
-        comments = input_data.scan(/\/\*.*\*\//m)
-        non_comments = input_data.split(/\/\*.*\*\//m)
+        comment_pattern = /\/\*.*?\*\//m
+        comments = input_data.scan(comment_pattern)
+        non_comments = input_data.split(comment_pattern)
 
         # Handle a small edge case, if our CSS is *only* comments,
         # the split, zip, scan trick won't work

data/test/test_tokenizer.rb

@@ -117,4 +117,11 @@ class TokenizerTest < Test::Unit::TestCase
       count += 1
     end
   end
+  
+  def test_comments_pattern_is_lazy
+    text = "/* * HAI * */ a {display:block} /* * BAI * */ em {font-style:normal}"
+    assert_tokens text,
+      :COMMENT, :IDENT, :LBRACE, :IDENT, :delim, [:IDENT, "block"], :delim,
+      :COMMENT, :IDENT, :LBRACE, :IDENT, :delim, [:IDENT, "normal"], :delim
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: csspool
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - Aaron Patterson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-09 00:00:00 -07:00
+date: 2008-04-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: csspool
-rubygems_version: 1.1.0
+rubygems_version: 1.0.1
 signing_key: 
 specification_version: 2
 summary: Parses CSS