diff options
Diffstat (limited to 'lib/coderay')
| -rw-r--r-- | lib/coderay/scanner.rb | 4 | ||||
| -rw-r--r-- | lib/coderay/scanners/ruby/patterns.rb | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/coderay/scanner.rb b/lib/coderay/scanner.rb index 6ea57eb..d33e2f2 100644 --- a/lib/coderay/scanner.rb +++ b/lib/coderay/scanner.rb @@ -66,7 +66,9 @@ module CodeRay end def normify code - code = code.to_s.to_unix + code = code.to_s + code.force_encoding 'binary' if code.respond_to? :force_encoding + code.to_unix end def file_extension extension = nil diff --git a/lib/coderay/scanners/ruby/patterns.rb b/lib/coderay/scanners/ruby/patterns.rb index 6f044f2..75937b7 100644 --- a/lib/coderay/scanners/ruby/patterns.rb +++ b/lib/coderay/scanners/ruby/patterns.rb @@ -49,7 +49,7 @@ module Scanners CLASS_VARIABLE = / @@ #{IDENT} /ox OBJECT_VARIABLE = / @@? #{IDENT} /ox GLOBAL_VARIABLE = / \$ (?: #{IDENT} | [1-9]\d* | 0\w* | [~&+`'=\/,;_.<>!@$?*":\\] | -[a-zA-Z_0-9] ) /ox - PREFIX_VARIABLE = / #{GLOBAL_VARIABLE} |#{OBJECT_VARIABLE} /ox + PREFIX_VARIABLE = / #{GLOBAL_VARIABLE} | #{OBJECT_VARIABLE} /ox VARIABLE = / @?@? #{IDENT} | #{GLOBAL_VARIABLE} /ox QUOTE_TO_TYPE = { |