diff options
| author | murphy <murphy@rubychan.de> | 2006-10-18 08:33:33 +0000 |
|---|---|---|
| committer | murphy <murphy@rubychan.de> | 2006-10-18 08:33:33 +0000 |
| commit | 4d7ce5f7037580a127ae26d36f49ac5cdf49000d (patch) | |
| tree | 5301411f9d019e2fc58858383f941963feaa60de /lib/coderay/scanners | |
| parent | 2c0a26c2f541fdd74d7af2d814c91d799121f761 (diff) | |
| download | coderay-4d7ce5f7037580a127ae26d36f49ac5cdf49000d.tar.gz | |
Fixed functional test.
Fixed Ruby scanner (/= was scanned as regexp!)
Made bench.rb run from any folder.
Made scanner test diff function work via EDITOR instead of gvimdiff.
Diffstat (limited to 'lib/coderay/scanners')
| -rw-r--r-- | lib/coderay/scanners/ruby.rb | 2 | ||||
| -rw-r--r-- | lib/coderay/scanners/ruby/patterns.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/coderay/scanners/ruby.rb b/lib/coderay/scanners/ruby.rb index 77fe664..1ad9d03 100644 --- a/lib/coderay/scanners/ruby.rb +++ b/lib/coderay/scanners/ruby.rb @@ -167,7 +167,7 @@ module Scanners end end ## experimental! - fancy_allowed = regexp_allowed = :set if patterns::REGEXP_ALLOWED[match] or check(/\s+(?:%\S|\/\S)/) + fancy_allowed = regexp_allowed = :set if patterns::REGEXP_ALLOWED[match] or check(/\s+[%\/][^\s=]/) # OPERATORS # elsif (not last_token_dot and match = scan(/ ==?=? | \.\.?\.? | [\(\)\[\]\{\}] | :: | , /x)) or diff --git a/lib/coderay/scanners/ruby/patterns.rb b/lib/coderay/scanners/ruby/patterns.rb index c601011..6023b21 100644 --- a/lib/coderay/scanners/ruby/patterns.rb +++ b/lib/coderay/scanners/ruby/patterns.rb @@ -21,7 +21,8 @@ module Scanners add(MODULE_KEYWORDS, :module_expected) IDENTS_ALLOWING_REGEXP = %w[ - and or not while until unless if then elsif when sub sub! gsub gsub! scan slice slice! split + and or not while until unless if then elsif when sub sub! gsub gsub! + scan slice slice! split ] REGEXP_ALLOWED = WordList.new(false). add(IDENTS_ALLOWING_REGEXP, :set) |