Skip to content

Support attr_reader/attr_writer/attr_accessor in singleton classes #463

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

Merged
sinsoku merged 1 commit into from
Jun 22, 2026
+35 −18
Merged

Support attr_reader/attr_writer/attr_accessor in singleton classes #463

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 21 additions & 18 deletions lib/typeprof/core/ast/meta.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ def install0(genv)
class AttrReaderMetaNode < Node
def initialize(raw_node, lenv)
super(raw_node, lenv)
@singleton = lenv.cref.scope_level == :metaclass
@args = []
raw_node.arguments.arguments.each do |raw_arg|
@args << raw_arg.value.to_sym if raw_arg.type == :symbol_node
Expand All @@ -57,9 +58,9 @@ def initialize(raw_node, lenv)
# TODO: fine-grained hover
end

attr_reader :args
attr_reader :singleton, :args

def attrs = { args: }
def attrs = { singleton:, args: }

def req_positionals = []
def opt_positionals = []
Expand All @@ -78,9 +79,9 @@ def mname_code_range(name)
def install0(genv)
@args.each do |arg|
ivar_name = :"@#{ arg }"
ivar_box = @changes.add_ivar_read_box(genv, @lenv.cref.cpath, false, ivar_name)
ivar_box = @changes.add_ivar_read_box(genv, @lenv.cref.cpath, @singleton, ivar_name)
ret_box = @changes.add_escape_box(genv, ivar_box.ret)
@changes.add_method_def_box(genv, @lenv.cref.cpath, false, arg, FormalArguments::Empty, [ret_box])
@changes.add_method_def_box(genv, @lenv.cref.cpath, @singleton, arg, FormalArguments::Empty, [ret_box])
end
Source.new
end
Expand All @@ -89,15 +90,16 @@ def install0(genv)
class AttrWriterMetaNode < Node
def initialize(raw_node, lenv)
super(raw_node, lenv)
@singleton = lenv.cref.scope_level == :metaclass
@args = []
raw_node.arguments.arguments.each do |raw_arg|
@args << raw_arg.value.to_sym if raw_arg.type == :symbol_node
end
end

attr_reader :args
attr_reader :singleton, :args

def attrs = { args: }
def attrs = { singleton:, args: }

def mname_code_range(name)
idx = @args.index(name.to_sym)
Expand All @@ -107,15 +109,15 @@ def mname_code_range(name)

def define0(genv)
@args.map do |arg|
mod = genv.resolve_ivar(lenv.cref.cpath, false, :"@#{ arg }")
mod = genv.resolve_ivar(lenv.cref.cpath, @singleton, :"@#{ arg }")
mod.add_def(self)
mod
end
end

def define_copy(genv)
@args.map do |arg|
mod = genv.resolve_ivar(lenv.cref.cpath, false, :"@#{ arg }")
mod = genv.resolve_ivar(lenv.cref.cpath, @singleton, :"@#{ arg }")
mod.add_def(self)
mod.remove_def(@prev_node)
mod
Expand All @@ -125,7 +127,7 @@ def define_copy(genv)

def undefine0(genv)
@args.each do |arg|
mod = genv.resolve_ivar(lenv.cref.cpath, false, :"@#{ arg }")
mod = genv.resolve_ivar(lenv.cref.cpath, @singleton, :"@#{ arg }")
mod.remove_def(self)
end
end
Expand All @@ -136,7 +138,7 @@ def install0(genv)
@changes.add_edge(genv, vtx, ive.vtx)
ret_box = @changes.add_escape_box(genv, vtx)
f_args = FormalArguments.new([vtx], [], nil, [], [], [], nil, nil)
@changes.add_method_def_box(genv, @lenv.cref.cpath, false, :"#{ arg }=", f_args, [ret_box])
@changes.add_method_def_box(genv, @lenv.cref.cpath, @singleton, :"#{ arg }=", f_args, [ret_box])
end
Source.new
end
Expand All @@ -145,6 +147,7 @@ def install0(genv)
class AttrAccessorMetaNode < Node
def initialize(raw_node, lenv)
super(raw_node, lenv)
@singleton = lenv.cref.scope_level == :metaclass
@args = []
raw_node.arguments.arguments.each do |raw_arg|
@args << raw_arg.value.to_sym if raw_arg.type == :symbol_node
Expand All @@ -153,9 +156,9 @@ def initialize(raw_node, lenv)
# TODO: fine-grained hover
end

attr_reader :args
attr_reader :singleton, :args

def attrs = { args: }
def attrs = { singleton:, args: }

def mname_code_range(name)
idx = @args.index(name.to_sym) # TODO: support string args
Expand All @@ -165,15 +168,15 @@ def mname_code_range(name)

def define0(genv)
@args.map do |arg|
mod = genv.resolve_ivar(lenv.cref.cpath, false, :"@#{ arg }")
mod = genv.resolve_ivar(lenv.cref.cpath, @singleton, :"@#{ arg }")
mod.add_def(self)
mod
end
end

def define_copy(genv)
@args.map do |arg|
mod = genv.resolve_ivar(lenv.cref.cpath, false, :"@#{ arg }")
mod = genv.resolve_ivar(lenv.cref.cpath, @singleton, :"@#{ arg }")
mod.add_def(self)
mod.remove_def(@prev_node)
mod
Expand All @@ -183,21 +186,21 @@ def define_copy(genv)

def undefine0(genv)
@args.each do |arg|
mod = genv.resolve_ivar(lenv.cref.cpath, false, :"@#{ arg }")
mod = genv.resolve_ivar(lenv.cref.cpath, @singleton, :"@#{ arg }")
mod.remove_def(self)
end
end

def install0(genv)
@args.zip(@static_ret) do |arg, ive|
ivar_box = @changes.add_ivar_read_box(genv, @lenv.cref.cpath, false, :"@#{ arg }")
ivar_box = @changes.add_ivar_read_box(genv, @lenv.cref.cpath, @singleton, :"@#{ arg }")
ret_box = @changes.add_escape_box(genv, ivar_box.ret)
@changes.add_method_def_box(genv, @lenv.cref.cpath, false, arg, FormalArguments::Empty, [ret_box])
@changes.add_method_def_box(genv, @lenv.cref.cpath, @singleton, arg, FormalArguments::Empty, [ret_box])

vtx = Vertex.new(self)
@changes.add_edge(genv, vtx, ive.vtx)
f_args = FormalArguments.new([vtx], [], nil, [], [], [], nil, nil)
@changes.add_method_def_box(genv, @lenv.cref.cpath, false, :"#{ arg }=", f_args, [ret_box])
@changes.add_method_def_box(genv, @lenv.cref.cpath, @singleton, :"#{ arg }=", f_args, [ret_box])
end
Source.new
end
Expand Down
14 changes: 14 additions & 0 deletions scenario/known-issues/eigenclass-attr.rb → scenario/class/eigenclass-attr.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,17 @@ class C
def self.name: -> untyped
def self.value=: (String) -> String
end

## update
class << Time
attr_accessor :count
end

Time.count = 1
Time.count

## assert
class Time
def self.count: -> Integer
def self.count=: (Integer) -> Integer
end
Loading