diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2016-02-13 15:59:39 +0100 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2016-02-13 15:59:39 +0100 |
| commit | 3c92a655c48f7f94c5076712f1950378968d6eb8 (patch) | |
| tree | 26b6017adc096d9bc50fafcf3cb8aeb0fdb53fa0 /lib/coderay/scanners/ruby | |
| parent | ee9e8407fb25e3383caa6e8954dc49ada031a538 (diff) | |
| parent | 0a1f500d524ff0fb5eeafef051ccbb641954a87a (diff) | |
| download | coderay-3c92a655c48f7f94c5076712f1950378968d6eb8.tar.gz | |
Merge branch 'master' into dsl
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 |