diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2016-02-13 15:25:41 +0100 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2016-02-13 15:25:41 +0100 |
| commit | 16d83136342ecb9f4d2afc21508f15182a679493 (patch) | |
| tree | dc5d8403372209c719f2fe8ee95989cb2fcf2020 /lib/coderay/scanners/ruby | |
| parent | ae5d868a13ac722e49f0c83080ee2e05ab8d9aa8 (diff) | |
| parent | 4f325ea97e85be66c96b5eb19a51012cdc34a905 (diff) | |
| download | coderay-16d83136342ecb9f4d2afc21508f15182a679493.tar.gz | |
Merge pull request #189 from rubychan/ruby-2.3
New Ruby 2.1, 2.2, 2.3 Syntax
Diffstat (limited to 'lib/coderay/scanners/ruby')
| -rw-r--r-- | lib/coderay/scanners/ruby/patterns.rb | 2 | ||||
| -rw-r--r-- | lib/coderay/scanners/ruby/string_state.rb | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lib/coderay/scanners/ruby/patterns.rb b/lib/coderay/scanners/ruby/patterns.rb index 0b36e13..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 | diff --git a/lib/coderay/scanners/ruby/string_state.rb b/lib/coderay/scanners/ruby/string_state.rb index 28ddd6c..95f1e83 100644 --- a/lib/coderay/scanners/ruby/string_state.rb +++ b/lib/coderay/scanners/ruby/string_state.rb @@ -37,6 +37,14 @@ module Scanners end end + def self.simple_key_pattern delim + if delim == "'" + / (?> (?: [^\\']+ | \\. )* ) ' : /mx + else + / (?> (?: [^\\"\#]+ | \\. | \#\$[\\"] | \#\{[^\{\}]+\} | \#(?!\{) )* ) " : /mx + end + end + def initialize kind, interpreted, delim, heredoc = false if heredoc pattern = heredoc_pattern delim, interpreted, heredoc == :indented |