mirror of
https://github.com/ruby/ruby.git
synced 2025-09-15 08:33:58 +02:00
[ruby/rdoc] Refine regexp usages and reduce substring allocations
a976fb9d39
This commit is contained in:
parent
1b67c58f41
commit
511864d1a7
3 changed files with 27 additions and 31 deletions
|
@ -2,6 +2,17 @@
|
|||
##
|
||||
# Manages changes of attributes in a block of text
|
||||
|
||||
unless MatchData.method_defined?(:match_length)
|
||||
using Module.new {
|
||||
refine(MatchData) {
|
||||
def match_length(nth)
|
||||
b, e = offset(nth)
|
||||
e - b if b
|
||||
end
|
||||
}
|
||||
}
|
||||
end
|
||||
|
||||
class RDoc::Markup::AttributeManager
|
||||
|
||||
##
|
||||
|
@ -153,16 +164,17 @@ class RDoc::Markup::AttributeManager
|
|||
tags = "[#{tags.join("")}](?!#{PROTECT_ATTR})"
|
||||
all_tags = "[#{@matching_word_pairs.keys.join("")}](?!#{PROTECT_ATTR})"
|
||||
|
||||
re = /(^|\W|#{all_tags})(#{tags})(\2*[#\\]?[\w:#{PROTECT_ATTR}.\/\[\]-]+?\S?)\2(?!\2)(#{all_tags}|\W|$)/
|
||||
re = /(?:^|\W|#{all_tags})\K(#{tags})(\1*[#\\]?[\w:#{PROTECT_ATTR}.\/\[\]-]+?\S?)\1(?!\1)(?=#{all_tags}|\W|$)/
|
||||
|
||||
1 while str.gsub!(re) { |orig|
|
||||
attr = @matching_word_pairs[$2]
|
||||
attr_updated = attrs.set_attrs($`.length + $1.length + $2.length, $3.length, attr)
|
||||
if attr_updated
|
||||
$1 + NULL * $2.length + $3 + NULL * $2.length + $4
|
||||
a, w = (m = $~).values_at(1, 2)
|
||||
attr = @matching_word_pairs[a]
|
||||
if attrs.set_attrs(m.begin(2), w.length, attr)
|
||||
a = NULL * a.length
|
||||
else
|
||||
$1 + NON_PRINTING_START + $2 + NON_PRINTING_END + $3 + NON_PRINTING_START + $2 + NON_PRINTING_END + $4
|
||||
a = NON_PRINTING_START + a + NON_PRINTING_END
|
||||
end
|
||||
a + w + a
|
||||
}
|
||||
str.delete!(NON_PRINTING_START + NON_PRINTING_END)
|
||||
end
|
||||
|
@ -173,9 +185,10 @@ class RDoc::Markup::AttributeManager
|
|||
@word_pair_map.each do |regexp, attr|
|
||||
next unless exclusive == exclusive?(attr)
|
||||
1 while str.gsub!(regexp) { |orig|
|
||||
updated = attrs.set_attrs($`.length + $1.length, $2.length, attr)
|
||||
w = (m = ($~))[2]
|
||||
updated = attrs.set_attrs(m.begin(2), w.length, attr)
|
||||
if updated
|
||||
NULL * $1.length + $2 + NULL * $3.length
|
||||
NULL * m.match_length(1) + w + NULL * m.match_length(3)
|
||||
else
|
||||
orig
|
||||
end
|
||||
|
@ -194,9 +207,9 @@ class RDoc::Markup::AttributeManager
|
|||
|
||||
1 while str.gsub!(/<(#{tags})>(.*?)<\/\1>/i) { |orig|
|
||||
attr = @html_tags[$1.downcase]
|
||||
html_length = $1.length + 2
|
||||
html_length = $~.match_length(1) + 2 # "<>".length
|
||||
seq = NULL * html_length
|
||||
attrs.set_attrs($`.length + html_length, $2.length, attr)
|
||||
attrs.set_attrs($~.begin(2), $~.match_length(2), attr)
|
||||
seq + $2 + seq + NULL
|
||||
}
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue