diff options
| author | murphy <murphy@rubychan.de> | 2008-07-29 16:51:44 +0000 |
|---|---|---|
| committer | murphy <murphy@rubychan.de> | 2008-07-29 16:51:44 +0000 |
| commit | f01dd70e76c89025d09436a5157e71b283d03c37 (patch) | |
| tree | 08b631075fd74d1dddbc474a842ce4f908f9a210 | |
| parent | 13d7eac0b77f3ca280e12422104753d7651ab047 (diff) | |
| download | coderay-f01dd70e76c89025d09436a5157e71b283d03c37.tar.gz | |
[KK] Just a little code cleanup and new task 187.
| -rw-r--r-- | Rakefile | 4 | ||||
| -rw-r--r-- | etc/coderay-lib.tmproj | 6 | ||||
| -rw-r--r-- | etc/coderay.tmproj | 83 | ||||
| -rw-r--r-- | lib/coderay/scanner.rb | 4 | ||||
| -rw-r--r-- | lib/coderay/scanners/ruby/patterns.rb | 2 |
5 files changed, 13 insertions, 86 deletions
@@ -35,6 +35,10 @@ task '18' do RUBY.replace 'ruby' end +task '187' do + RUBY.replace 'ruby187' +end + task 'yarv' do RUBY.replace 'ruby-yarv' end diff --git a/etc/coderay-lib.tmproj b/etc/coderay-lib.tmproj index 1801248..d97a407 100644 --- a/etc/coderay-lib.tmproj +++ b/etc/coderay-lib.tmproj @@ -75,8 +75,6 @@ <string>../Rakefile</string> <key>lastUsed</key> <date>2006-10-31T02:10:52Z</date> - <key>selected</key> - <true/> </dict> <dict> <key>filename</key> @@ -89,6 +87,10 @@ <dict> <key>filename</key> <string>../TODO</string> + <key>lastUsed</key> + <date>2008-01-21T03:03:08Z</date> + <key>selected</key> + <true/> </dict> <dict> <key>name</key> diff --git a/etc/coderay.tmproj b/etc/coderay.tmproj index ed8791c..2597bf4 100644 --- a/etc/coderay.tmproj +++ b/etc/coderay.tmproj @@ -2,8 +2,6 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>currentDocument</key> - <string>../rake_tasks/gem.rake</string> <key>documents</key> <array> <dict> @@ -20,86 +18,7 @@ <key>fileHierarchyDrawerWidth</key> <integer>312</integer> <key>metaData</key> - <dict> - <key>../lib/coderay/scanners/ruby.rb</key> - <dict> - <key>caret</key> - <dict> - <key>column</key> - <integer>50</integer> - <key>line</key> - <integer>11</integer> - </dict> - <key>firstVisibleColumn</key> - <integer>0</integer> - <key>firstVisibleLine</key> - <integer>0</integer> - </dict> - <key>../lib/coderay/scanners/ruby/patterns.rb</key> - <dict> - <key>caret</key> - <dict> - <key>column</key> - <integer>43</integer> - <key>line</key> - <integer>18</integer> - </dict> - <key>firstVisibleColumn</key> - <integer>0</integer> - <key>firstVisibleLine</key> - <integer>0</integer> - </dict> - <key>../rake_tasks/gem.rake</key> - <dict> - <key>caret</key> - <dict> - <key>column</key> - <integer>44</integer> - <key>line</key> - <integer>89</integer> - </dict> - <key>firstVisibleColumn</key> - <integer>0</integer> - <key>firstVisibleLine</key> - <integer>77</integer> - </dict> - <key>../test/scanners/coderay_suite.rb</key> - <dict> - <key>caret</key> - <dict> - <key>column</key> - <integer>29</integer> - <key>line</key> - <integer>316</integer> - </dict> - <key>firstVisibleColumn</key> - <integer>0</integer> - <key>firstVisibleLine</key> - <integer>305</integer> - </dict> - <key>../test/scanners/ruby/regexp.in.rb</key> - <dict> - <key>caret</key> - <dict> - <key>column</key> - <integer>51</integer> - <key>line</key> - <integer>4</integer> - </dict> - <key>firstVisibleColumn</key> - <integer>0</integer> - <key>firstVisibleLine</key> - <integer>0</integer> - </dict> - </dict> - <key>openDocuments</key> - <array> - <string>../lib/coderay/scanners/ruby.rb</string> - <string>../test/scanners/coderay_suite.rb</string> - <string>../test/scanners/ruby/regexp.in.rb</string> - <string>../rake_tasks/gem.rake</string> - <string>../lib/coderay/scanners/ruby/patterns.rb</string> - </array> + <dict/> <key>showFileHierarchyDrawer</key> <true/> <key>windowFrame</key> 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 = { |