Skip to content

Commit efc8fd3

Browse files
committed
Rename Primitive.object_respond_to? to Primitive.respond_to?
1 parent 5d68364 commit efc8fd3

File tree

8 files changed

+23
-23
lines changed

8 files changed

+23
-23
lines changed

src/main/java/org/truffleruby/core/support/TypeNodes.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ protected boolean isA(Object object, RubyModule module,
7575
}
7676
}
7777

78-
@Primitive(name = "object_respond_to?")
79-
public abstract static class ObjectRespondToNode extends PrimitiveArrayArgumentsNode {
78+
@Primitive(name = "respond_to?")
79+
public abstract static class RespondToPrimitiveNode extends PrimitiveArrayArgumentsNode {
8080
@Specialization
81-
protected boolean objectRespondTo(Object object, Object name, boolean includePrivate,
81+
protected boolean respondTo(Object object, Object name, boolean includePrivate,
8282
@Cached KernelNodes.RespondToNode respondToNode) {
8383
// Do not pass a frame here, we want to ignore refinements and not need to read the caller frame
8484
return respondToNode.executeDoesRespondTo(object, name, includePrivate);

src/main/ruby/truffleruby/core/array.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1362,7 +1362,7 @@ def zip(*others)
13621362

13631363
if array
13641364
array
1365-
elsif Primitive.object_respond_to?(other, :each, false)
1365+
elsif Primitive.respond_to?(other, :each, false)
13661366
other.to_enum(:each)
13671367
else
13681368
raise TypeError, "wrong argument type #{Primitive.object_class(other)} (must respond to :each)"

src/main/ruby/truffleruby/core/enumerable.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ def lazy
185185
end
186186

187187
def enumerator_size
188-
Primitive.object_respond_to?(self, :size, false) ? size : nil
188+
Primitive.respond_to?(self, :size, false) ? size : nil
189189
end
190190
private :enumerator_size
191191

@@ -339,7 +339,7 @@ def zip(*enums)
339339

340340
if array
341341
array
342-
elsif Primitive.object_respond_to?(enum, :each, false)
342+
elsif Primitive.respond_to?(enum, :each, false)
343343
enum.to_enum(:each)
344344
else
345345
raise TypeError, "wrong argument type #{Primitive.object_class(enum)} (must respond to :each)"

src/main/ruby/truffleruby/core/enumerator.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -489,8 +489,8 @@ def flat_map
489489
Lazy.new(self, nil) do |yielder, *args|
490490
yield_ret = yield(*args)
491491

492-
if Primitive.object_respond_to?(yield_ret, :force, false) &&
493-
Primitive.object_respond_to?(yield_ret, :each, false)
492+
if Primitive.respond_to?(yield_ret, :force, false) &&
493+
Primitive.respond_to?(yield_ret, :each, false)
494494
yield_ret.each do |v|
495495
yielder.yield v
496496
end
@@ -535,7 +535,7 @@ def zip(*lists)
535535

536536
if array
537537
array
538-
elsif Primitive.object_respond_to?(list, :each, false)
538+
elsif Primitive.respond_to?(list, :each, false)
539539
list.to_enum :each
540540
else
541541
raise TypeError, "wrong argument type #{Primitive.object_class(list)} (must respond to :each)"

src/main/ruby/truffleruby/core/marshal.rb

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,7 @@ def construct_data
814814

815815
store_unique_object obj
816816

817-
unless Primitive.object_respond_to? obj, :_load_data, false
817+
unless Primitive.respond_to? obj, :_load_data, false
818818
raise TypeError,
819819
"class #{name} needs to have instance method `_load_data'"
820820
end
@@ -1002,7 +1002,7 @@ def construct_user_defined(ivar_index)
10021002

10031003
data = get_byte_sequence
10041004

1005-
if Primitive.object_respond_to? klass, :__construct__, false
1005+
if Primitive.respond_to? klass, :__construct__, false
10061006
return klass.__construct__(self, data, ivar_index, @has_ivar)
10071007
end
10081008

@@ -1026,7 +1026,7 @@ def construct_user_marshal
10261026

10271027
extend_object obj if @modules
10281028

1029-
unless Primitive.object_respond_to? obj, :marshal_load, true
1029+
unless Primitive.respond_to? obj, :marshal_load, true
10301030
raise TypeError, "instance of #{klass} needs to have method `marshal_load'"
10311031
end
10321032

@@ -1103,9 +1103,9 @@ def serialize(obj)
11031103
add_non_immediate_object obj
11041104

11051105
# ORDER MATTERS.
1106-
if Primitive.object_respond_to? obj, :marshal_dump, true
1106+
if Primitive.respond_to? obj, :marshal_dump, true
11071107
str = serialize_user_marshal obj
1108-
elsif Primitive.object_respond_to? obj, :_dump, true
1108+
elsif Primitive.respond_to? obj, :_dump, true
11091109
str = serialize_user_defined obj
11101110
else
11111111
str = obj.__send__ :__marshal__, self
@@ -1259,7 +1259,7 @@ def serialize_user_class!(klass)
12591259
end
12601260

12611261
def serialize_user_defined(obj)
1262-
if Primitive.object_respond_to? obj, :__custom_marshal__, false
1262+
if Primitive.respond_to? obj, :__custom_marshal__, false
12631263
return obj.__custom_marshal__(self)
12641264
end
12651265

@@ -1440,10 +1440,10 @@ def self.dump(obj, an_io = nil, limit = nil)
14401440
ms = State.new nil, depth, nil, nil
14411441

14421442
if an_io
1443-
unless Primitive.object_respond_to? an_io, :write, false
1443+
unless Primitive.respond_to? an_io, :write, false
14441444
raise TypeError, 'output must respond to write'
14451445
end
1446-
if Primitive.object_respond_to? an_io, :binmode, false
1446+
if Primitive.respond_to? an_io, :binmode, false
14471447
an_io.binmode
14481448
end
14491449
end
@@ -1459,14 +1459,14 @@ def self.dump(obj, an_io = nil, limit = nil)
14591459
end
14601460

14611461
def self.load(obj, prc = nil, freeze: false)
1462-
if Primitive.object_respond_to? obj, :to_str, false
1462+
if Primitive.respond_to? obj, :to_str, false
14631463
data = obj.to_s
14641464
ms = StringState.new data, nil, prc, freeze
14651465

14661466
major = ms.consume_byte
14671467
minor = ms.consume_byte
1468-
elsif Primitive.object_respond_to? obj, :read, false and
1469-
Primitive.object_respond_to? obj, :getc, false
1468+
elsif Primitive.respond_to? obj, :read, false and
1469+
Primitive.respond_to? obj, :getc, false
14701470
ms = IOState.new obj, nil, prc, freeze
14711471

14721472
major = ms.consume_byte

src/main/ruby/truffleruby/core/truffle/exception_operations.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def self.class_name(receiver)
7575
# MRI: name_err_mesg_to_str
7676
def self.receiver_string(receiver)
7777
ret = begin
78-
if Primitive.object_respond_to?(receiver, :inspect, false)
78+
if Primitive.respond_to?(receiver, :inspect, false)
7979
Truffle::Type.rb_inspect(receiver)
8080
else
8181
nil

src/main/ruby/truffleruby/core/truffle/interop.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ def self.get_members_implementation(object, internal)
9696
else
9797
add_method_key = proc do |method|
9898
# do not list methods which cannot be read using interop
99-
keys << method.to_s if Primitive.object_respond_to? object, method, true
99+
keys << method.to_s if Primitive.respond_to? object, method, true
100100
end
101101

102102
object.public_methods.each(&add_method_key)

src/main/ruby/truffleruby/core/type.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ def self.coerce_to_path(obj, check_null = true)
422422
if Primitive.is_a?(obj, String)
423423
path = obj
424424
else
425-
if Primitive.object_respond_to? obj, :to_path, false
425+
if Primitive.respond_to? obj, :to_path, false
426426
obj = obj.to_path
427427
end
428428

0 commit comments

Comments
 (0)