diff options
author | Kornelius Kalnbach <murphy@rubychan.de> | 2017-11-02 23:25:41 +0100 |
---|---|---|
committer | Kornelius Kalnbach <murphy@rubychan.de> | 2017-11-02 23:25:41 +0100 |
commit | 853787554d17570dace133340e3ec555b0e56e0d (patch) | |
tree | c3fe74694c0ea315d7df7d8d35869df61b1191bb /lib | |
parent | ffdd9ddb5cb5ab19a04ee0a714fa08d8d70f3437 (diff) | |
parent | e15cf96405177153e1418496a7a8e85beaa679fb (diff) | |
download | coderay-853787554d17570dace133340e3ec555b0e56e0d.tar.gz |
Merge branch 'master' into possible-speedups
Diffstat (limited to 'lib')
-rw-r--r-- | lib/coderay/encoders/encoder.rb | 2 | ||||
-rw-r--r-- | lib/coderay/encoders/html.rb | 4 | ||||
-rw-r--r-- | lib/coderay/scanners/haml.rb | 2 | ||||
-rw-r--r-- | lib/coderay/scanners/java.rb | 2 | ||||
-rw-r--r--[-rwxr-xr-x] | lib/coderay/token_kinds.rb | 0 | ||||
-rw-r--r-- | lib/coderay/version.rb | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/lib/coderay/encoders/encoder.rb b/lib/coderay/encoders/encoder.rb index fa5695d..2baeedb 100644 --- a/lib/coderay/encoders/encoder.rb +++ b/lib/coderay/encoders/encoder.rb @@ -146,7 +146,7 @@ module CodeRay end def get_output options - options[:out] || '' + options[:out] || ''.dup end # Append data.to_s to the output. Returns the argument. diff --git a/lib/coderay/encoders/html.rb b/lib/coderay/encoders/html.rb index 0365022..5d55b00 100644 --- a/lib/coderay/encoders/html.rb +++ b/lib/coderay/encoders/html.rb @@ -161,7 +161,7 @@ module Encoders if options[:wrap] || options[:line_numbers] @real_out = @out - @out = '' + @out = ''.dup end @break_lines = (options[:break_lines] == true) @@ -297,7 +297,7 @@ module Encoders end def break_lines text, style - reopen = '' + reopen = ''.dup @opened.each_with_index do |kind, index| reopen << (@span_for_kinds[index > 0 ? [kind, *@opened[0...index]] : kind] || '<span>') end diff --git a/lib/coderay/scanners/haml.rb b/lib/coderay/scanners/haml.rb index 5433790..d516ba9 100644 --- a/lib/coderay/scanners/haml.rb +++ b/lib/coderay/scanners/haml.rb @@ -75,7 +75,7 @@ module Scanners tag = false - if match = scan(/%[\w:]+\/?/) + if match = scan(/%[-\w:]+\/?/) encoder.text_token match, :tag # if match = scan(/( +)(.+)/) # encoder.text_token self[1], :space diff --git a/lib/coderay/scanners/java.rb b/lib/coderay/scanners/java.rb index 962154e..982a796 100644 --- a/lib/coderay/scanners/java.rb +++ b/lib/coderay/scanners/java.rb @@ -44,7 +44,7 @@ module Scanners '"' => /[^\\"]+/, '/' => /[^\\\/]+/, } # :nodoc: - IDENT = /[a-zA-Z_][A-Za-z_0-9]*/ # :nodoc: + IDENT = RUBY_VERSION < '1.9' ? /[a-zA-Z_][A-Za-z_0-9]*/ : Regexp.new('[[[:alpha:]]_][[[:alnum:]]_]*') # :nodoc: protected diff --git a/lib/coderay/token_kinds.rb b/lib/coderay/token_kinds.rb index f911862..f911862 100755..100644 --- a/lib/coderay/token_kinds.rb +++ b/lib/coderay/token_kinds.rb diff --git a/lib/coderay/version.rb b/lib/coderay/version.rb index 7ea3f70..f5e7a39 100644 --- a/lib/coderay/version.rb +++ b/lib/coderay/version.rb @@ -1,3 +1,3 @@ module CodeRay - VERSION = '1.1.1' + VERSION = '1.1.2' end |