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

Fix full name of known class #873

Merged
merged 1 commit into from
Mar 16, 2022
Merged

Fix full name of known class #873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions lib/rdoc/parser/c.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,13 +667,14 @@ def find_body class_name, meth_name, meth_obj, file_content, quiet = false
##
# Finds a RDoc::NormalClass or RDoc::NormalModule for +raw_name+

def find_class(raw_name, name)
def find_class(raw_name, name, base_name = nil)
unless @classes[raw_name]
if raw_name =~ /^rb_m/
container = @top_level.add_module RDoc::NormalModule, name
else
container = @top_level.add_class RDoc::NormalClass, name
end
container.name = base_name if base_name

container.record_location @top_level
@classes[raw_name] = container
Expand Down Expand Up @@ -911,7 +912,7 @@ def handle_constants(type, var_name, const_name, definition)

return unless class_name

class_obj = find_class var_name, class_name
class_obj = find_class var_name, class_name, class_name[/::\K[^:]+\z/]

unless class_obj then
@options.warn 'Enclosing class or module %p is not known' % [const_name]
Expand Down
11 changes: 11 additions & 0 deletions test/rdoc/test_rdoc_parser_c.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,17 @@ def test_do_constants_file
assert_equal 'LOCK_SH', constant.name
assert_equal 'INT2FIX(LOCK_SH)', constant.value
assert_equal 'Shared lock', constant.comment.text

@parser = util_parser <<-EOF
void Init_File(void) {
rb_cFile = rb_define_class("File", rb_cIO);
rb_mFConst = rb_define_module_under(rb_cFile, "Constants");
}
EOF
@parser.do_classes_and_modules
@parser.do_constants

assert_equal 'File::Constants', klass.full_name
end

def test_do_includes
Expand Down