diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2016-02-13 15:57:11 +0100 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2016-02-13 15:57:11 +0100 |
| commit | 8d908474eff99a0a653bbc94f459537d56b83e92 (patch) | |
| tree | 4b066ea50ca5f95f07782d0c58f8081c4c3ef39f /lib/coderay/scanners/ruby/patterns.rb | |
| parent | bf395bd14ed7f63aab84955f6768f59965e3a73e (diff) | |
| parent | 0a1f500d524ff0fb5eeafef051ccbb641954a87a (diff) | |
| download | coderay-cleanup-output.tar.gz | |
Merge branch 'master' into cleanup-outputcleanup-output
Diffstat (limited to 'lib/coderay/scanners/ruby/patterns.rb')
| -rw-r--r-- | lib/coderay/scanners/ruby/patterns.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/coderay/scanners/ruby/patterns.rb b/lib/coderay/scanners/ruby/patterns.rb index ed071d2..e5a156d 100644 --- a/lib/coderay/scanners/ruby/patterns.rb +++ b/lib/coderay/scanners/ruby/patterns.rb @@ -114,7 +114,7 @@ module Scanners # NOTE: This is not completely correct, but # nobody needs heredoc delimiters ending with \n. HEREDOC_OPEN = / - << (-)? # $1 = float + << ([-~])? # $1 = float (?: ( [A-Za-z_0-9]+ ) # $2 = delim | @@ -157,13 +157,16 @@ module Scanners yield ]) - FANCY_STRING_START = / % ( [QqrsWwx] | (?![a-zA-Z0-9]) ) ([^a-zA-Z0-9]) /x + FANCY_STRING_START = / % ( [iIqQrswWx] | (?![a-zA-Z0-9]) ) ([^a-zA-Z0-9]) /x FANCY_STRING_KIND = Hash.new(:string).merge({ + 'i' => :symbol, + 'I' => :symbol, 'r' => :regexp, 's' => :symbol, 'x' => :shell, }) FANCY_STRING_INTERPRETED = Hash.new(true).merge({ + 'i' => false, 'q' => false, 's' => false, 'w' => false, |