Fixed warning in bench.rb.

Ruby Scanner: improved handling of ambiguos values.
- operator methods are now :ident instead of :operator 
- fancy_allowed and regexp_allowed are now value_expected
- value_expected works in operator method calls
- tests enhanced and adjusted
Scanner tests: new diffed option, diff doesn't imply noassert anymore

1 files changed, 3 insertions, 3 deletions

diff --git a/test/scanners/coderay_suite.rb b/test/scanners/coderay_suite.rb
index 280e182..6a2725c 100644
--- a/test/scanners/coderay_suite.rb
+++ b/test/scanners/coderay_suite.rb
@@ -152,11 +152,11 @@ module CodeRay
               File.open(actual_filename, 'wb') { |f| f.write result }
               if ENV['diff']
                 diff = expected_filename.sub(/\.expected\..*/, '.debug.diff')
-                system "diff #{expected_filename} #{actual_filename} > #{diff}"
-                system "EDITOR #{diff}"
+                system "diff --text #{expected_filename} #{actual_filename} > #{diff}"
+                system "EDITOR #{diff}" if ENV['diffed']
               end
             end
-            unless ENV['diff'] or ENV['noassert']
+            unless ENV['noassert']
               assert(ok, "Scan error: unexpected output")
             end
           else