Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Performance improvement #397

Merged
merged 4 commits into from Apr 29, 2016
Merged

Performance improvement #397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6d3c15c
Avoid re-parsing by pre-computing a method-body table
mame Mar 15, 2016
bd698a4
Avoid re-parsing by pre-computing a const table
mame Mar 15, 2016
869202f
Cache the result of Time.parse
mame Mar 15, 2016
72f14d8
Remove an extra branch from the bottleneck
mame Mar 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
106 changes: 74 additions & 32 deletions lib/rdoc/parser/c.rb
View file
Open in desktop
Expand Up @@ -605,18 +605,46 @@ def find_attr_comment var_name, attr_name, read = nil, write = nil
RDoc::Comment.new comment, @top_level
end

##
# Generate a Ruby-method table

def gen_body_table file_content
table = {}
file_content.scan(%r{
((?>/\*.*?\*/\s*)?)
((?:(?:\w+)\s+)?
(?:intern\s+)?VALUE\s+(\w+)
\s*(?:\([^)]*\))(?:[^;]|$))
| ((?>/\*.*?\*/\s*))^\s*(\#\s*define\s+(\w+)\s+(\w+))
| ^\s*\#\s*define\s+(\w+)\s+(\w+)
}xm) do
case
when $1
table[$3] = [:func_def, $1, $2, $~.offset(2)] if !table[$3] || table[$3][0] != :func_def
when $4
table[$6] = [:macro_def, $4, $5, $~.offset(5), $7] if !table[$6] || table[$6][0] == :macro_alias
when $8
table[$8] ||= [:macro_alias, $9]
end
end
table
end

##
# Find the C code corresponding to a Ruby method

def find_body class_name, meth_name, meth_obj, file_content, quiet = false
case file_content
when %r%((?>/\*.*?\*/\s*)?)
((?:(?:\w+)\s+)?
(?:intern\s+)?VALUE\s+#{meth_name}
\s*(\([^)]*\))([^;]|$))%xm then
comment = RDoc::Comment.new $1, @top_level
body = $2
offset, = $~.offset(2)
if file_content
@body_table ||= {}
@body_table[file_content] ||= gen_body_table file_content
type, *args = @body_table[file_content][meth_name]
end

case type
when :func_def
comment = RDoc::Comment.new args[0], @top_level
body = args[1]
offset, = args[2]

comment.remove_private if comment

Expand Down Expand Up @@ -645,12 +673,12 @@ def find_body class_name, meth_name, meth_obj, file_content, quiet = false
meth_obj.line = file_content[0, offset].count("\n") + 1

body
when %r%((?>/\*.*?\*/\s*))^\s*(\#\s*define\s+#{meth_name}\s+(\w+))%m then
comment = RDoc::Comment.new $1, @top_level
body = $2
offset = $~.offset(2).first
when :macro_def
comment = RDoc::Comment.new args[0], @top_level
body = args[1]
offset, = args[2]

find_body class_name, $3, meth_obj, file_content, true
find_body class_name, args[3], meth_obj, file_content, true

comment.normalize
find_modifiers comment, meth_obj
Expand All @@ -664,11 +692,11 @@ def find_body class_name, meth_name, meth_obj, file_content, quiet = false
meth_obj.line = file_content[0, offset].count("\n") + 1

body
when %r%^\s*\#\s*define\s+#{meth_name}\s+(\w+)%m then
when :macro_alias
# with no comment we hope the aliased definition has it and use it's
# definition

body = find_body(class_name, $1, meth_obj, file_content, true)
body = find_body(class_name, args[0], meth_obj, file_content, true)

return body if body

Expand Down Expand Up @@ -763,28 +791,42 @@ def find_class_comment class_name, class_mod
class_mod.add_comment comment, @top_level
end

##
# Generate a const table

def gen_const_table file_content
table = {}
@content.scan(%r{
((?>^\s*/\*.*?\*/\s+))
rb_define_(\w+)\((?:\s*(?:\w+),)?\s*
"(\w+)"\s*,
.*?\)\s*;
| Document-(?:const|global|variable):\s
((?:\w+::)*\w+)
\s*?\n((?>.*?\*/))
}mxi) do
case
when $1 then table[[$2, $3]] = $1
when $4 then table[$4] = "/*\n" + $5
end
end
table
end

##
# Finds a comment matching +type+ and +const_name+ either above the
# comment or in the matching Document- section.

def find_const_comment(type, const_name, class_name = nil)
comment = if @content =~ %r%((?>^\s*/\*.*?\*/\s+))
rb_define_#{type}\((?:\s*(\w+),)?\s*
"#{const_name}"\s*,
.*?\)\s*;%xmi then
$1
elsif class_name and
@content =~ %r%Document-(?:const|global|variable):\s
#{class_name}::#{const_name}
\s*?\n((?>.*?\*/))%xm then
"/*\n#{$1}"
elsif @content =~ %r%Document-(?:const|global|variable):
\s#{const_name}
\s*?\n((?>.*?\*/))%xm then
"/*\n#{$1}"
else
''
end
@const_table ||= {}
@const_table[@content] ||= gen_const_table @content
table = @const_table[@content]

comment =
table[[type, const_name]] ||
(class_name && table[class_name + "::" + const_name]) ||
table[const_name] ||
''

RDoc::Comment.new comment, @top_level
end
Expand Down
7 changes: 6 additions & 1 deletion lib/rdoc/parser/changelog.rb
View file
Open in desktop
Expand Up @@ -101,9 +101,11 @@ def create_items items
# Groups +entries+ by date.

def group_entries entries
@time_cache ||= {}
entries.group_by do |title, _|
begin
Time.parse(title).strftime '%Y-%m-%d'
time = @time_cache[title]
(time || Time.parse(title)).strftime '%Y-%m-%d'
rescue NoMethodError, ArgumentError
time, = title.split ' ', 2
Time.parse(time).strftime '%Y-%m-%d'
Expand All @@ -127,6 +129,7 @@ def group_entries entries
# 'README.EXT.ja: ditto']]

def parse_entries
@time_cache ||= {}
entries = []
entry_name = nil
entry_body = []
Expand All @@ -142,6 +145,7 @@ def parse_entries

begin
time = Time.parse entry_name
@time_cache[entry_name] = time
# HACK Ruby 1.8 does not raise ArgumentError for Time.parse "Other"
entry_name = nil unless entry_name =~ /#{time.year}/
rescue NoMethodError
Expand Down Expand Up @@ -184,6 +188,7 @@ def parse_entries
# Converts the ChangeLog into an RDoc::Markup::Document

def scan
@time_cache = {}
entries = parse_entries
grouped_entries = group_entries entries

Expand Down
22 changes: 9 additions & 13 deletions lib/rdoc/ruby_lex.rb
View file
Open in desktop
Expand Up @@ -101,10 +101,10 @@ def initialize(content, options)
@exp_line_no = @line_no = 1
@here_readed = []
@readed = []
@current_readed = @readed
@rests = []
@seek = 0

@here_header = false
@indent = 0
@indent_stack = []
@lex_state = :EXPR_BEG
Expand Down Expand Up @@ -160,7 +160,7 @@ def get_readed
end

readed = @readed.join("")
@readed = []
@readed.clear
readed
end

Expand All @@ -170,13 +170,9 @@ def getc
@rests.push nil unless buf_input
end
c = @rests.shift
if @here_header
@here_readed.push c
else
@readed.push c
end
@current_readed.push c
@seek += 1
if c == "\n"
if c == "\n".freeze
@line_no += 1
@char_no = 0
else
Expand Down Expand Up @@ -282,7 +278,7 @@ def initialize_input
@indent_stack = []
@lex_state = :EXPR_BEG
@space_seen = false
@here_header = false
@current_readed = @readed

@continue = false
prompt
Expand Down Expand Up @@ -461,8 +457,8 @@ def lex_init()
@indent_stack.pop
end
end
@here_header = false
@here_readed = []
@current_readed = @readed
@here_readed.clear
Token(TkNL)
end

Expand Down Expand Up @@ -1020,7 +1016,7 @@ def identify_here_document
doc = '"'
end

@here_header = false
@current_readed = @readed
while l = gets
l = l.sub(/(:?\r)?\n\z/, "\n")
if (indent ? l.strip : l.chomp) == quoted
Expand All @@ -1037,7 +1033,7 @@ def identify_here_document
doc << '"'
end

@here_header = true
@current_readed = @here_readed
@here_readed.concat reserve
while ch = reserve.pop
ungetc ch
Expand Down