scanner tweaks

4 files changed, 12 insertions, 9 deletions

diff --git a/lib/coderay/rule_based_scanner.rb b/lib/coderay/rule_based_scanner.rb
index ac6a623..9239cf6 100644
--- a/lib/coderay/rule_based_scanner.rb
+++ b/lib/coderay/rule_based_scanner.rb
@@ -219,18 +219,20 @@ module CodeRay
         
         protected
         
-        def make_callback block
+        def callbacks
           @callbacks ||= {}
-          
+        end
+        
+        def make_callback block
           base_name = "__callback_line_#{block.source_location.last}"
           name = base_name
           counter = 'a'
-          while @callbacks.key?(name)
+          while callbacks.key?(name)
             name = "#{base_name}_#{counter}"
             counter.succ!
           end
           
-          @callbacks[name] = define_method(name, &block)
+          callbacks[name] = define_method(name, &block)
           
           arguments = block.parameters.map(&:last)
           
diff --git a/lib/coderay/scanners/c2.rb b/lib/coderay/scanners/c2.rb
index d21e032..a5d4d09 100644
--- a/lib/coderay/scanners/c2.rb
+++ b/lib/coderay/scanners/c2.rb
@@ -118,7 +118,7 @@ module Scanners
     
     if ENV['PUTS']
       puts scan_tokens_code
-      puts "callbacks: #{@callbacks.size}"
+      puts "callbacks: #{callbacks.size}"
     end
     class_eval scan_tokens_code, __FILE__, def_line
   end
diff --git a/lib/coderay/scanners/css2.rb b/lib/coderay/scanners/css2.rb
index 93b890a..edb9ca3 100644
--- a/lib/coderay/scanners/css2.rb
+++ b/lib/coderay/scanners/css2.rb
@@ -88,6 +88,7 @@ module Scanners
       states = Array(options[:state] || @state).dup
       value_expected = @value_expected
       block = @block
+      state = states.last
       
       until eos?
         
@@ -112,8 +113,8 @@ module Scanners
     RUBY
     
     if ENV['PUTS']
-      puts scan_tokens_code
-      puts "callbacks: #{@callbacks.size}"
+      puts CodeRay.scan(scan_tokens_code, :ruby).terminal
+      puts "callbacks: #{callbacks.size}"
     end
     class_eval scan_tokens_code, __FILE__, def_line
     
diff --git a/lib/coderay/scanners/java_script5.rb b/lib/coderay/scanners/java_script5.rb
index e337cc5..ae68cef 100644
--- a/lib/coderay/scanners/java_script5.rb
+++ b/lib/coderay/scanners/java_script5.rb
@@ -174,8 +174,8 @@ module Scanners
     RUBY
     
     if ENV['PUTS']
-      puts scan_tokens_code
-      puts "callbacks: #{@callbacks.size}"
+      puts CodeRay.scan(scan_tokens_code, :ruby).terminal
+      puts "callbacks: #{callbacks.size}"
     end
     class_eval scan_tokens_code, __FILE__, def_line