Skip to content

Commit 134c136

Browse files
eregoneregon
committed
Rename Truffle::Interop methods which would incorrectly start with "is_"
1 parent e54fe16 commit 134c136

File tree

4 files changed

+29
-29
lines changed

4 files changed

+29
-29
lines changed

‎spec/truffle/interop/java_string_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
describe "Java strings" do
1212

1313
it "is String" do
14-
Truffle::Interop.is_string?(Truffle::Interop.to_java_string('test')).should be_true
14+
Truffle::Interop.string?(Truffle::Interop.to_java_string('test')).should be_true
1515
end
1616

1717
it "return the same object if attempted to be unboxed" do

‎spec/truffle/interop/key_info_spec.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ def key_info(object, index)
1818
*(:insertable if Truffle::Interop.array_element_insertable?(object, index)),
1919
*(:removable if Truffle::Interop.array_element_removable?(object, index))]
2020
else
21-
[*(:readable if Truffle::Interop.is_member_readable?(object, index)),
22-
*(:modifiable if Truffle::Interop.is_member_modifiable?(object, index)),
23-
*(:insertable if Truffle::Interop.is_member_insertable?(object, index)),
24-
*(:removable if Truffle::Interop.is_member_removable?(object, index)),
25-
*(:internal if Truffle::Interop.is_member_internal?(object, index)),
26-
*(:invocable if Truffle::Interop.is_member_invocable?(object, index))]
21+
[*(:readable if Truffle::Interop.member_readable?(object, index)),
22+
*(:modifiable if Truffle::Interop.member_modifiable?(object, index)),
23+
*(:insertable if Truffle::Interop.member_insertable?(object, index)),
24+
*(:removable if Truffle::Interop.member_removable?(object, index)),
25+
*(:internal if Truffle::Interop.member_internal?(object, index)),
26+
*(:invocable if Truffle::Interop.member_invocable?(object, index))]
2727
end
2828
end
2929

‎src/main/java/org/truffleruby/interop/InteropNodes.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ protected boolean isArrayElementExisting(Object receiver, long index,
603603
// endregion
604604

605605
// region String
606-
@CoreMethod(names = "is_string?", onSingleton = true, required = 1)
606+
@CoreMethod(names = "string?", onSingleton = true, required = 1)
607607
public abstract static class IsStringNode extends InteropCoreMethodArrayArgumentsNode {
608608
@Specialization(limit = "getCacheLimit()")
609609
protected boolean isString(Object receiver,
@@ -706,7 +706,7 @@ protected boolean asBoolean(Object receiver,
706706
// endregion
707707

708708
// region Number
709-
@CoreMethod(names = "is_number?", onSingleton = true, required = 1)
709+
@CoreMethod(names = "number?", onSingleton = true, required = 1)
710710
public abstract static class IsNumberNode extends InteropCoreMethodArrayArgumentsNode {
711711
@Specialization(limit = "getCacheLimit()")
712712
protected boolean isNumber(Object receiver,
@@ -1042,7 +1042,7 @@ protected static int getCacheLimit() {
10421042
}
10431043
}
10441044

1045-
@CoreMethod(names = "is_member_readable?", onSingleton = true, required = 2)
1045+
@CoreMethod(names = "member_readable?", onSingleton = true, required = 2)
10461046
public abstract static class IsMemberReadableNode extends InteropCoreMethodArrayArgumentsNode {
10471047
@Specialization(limit = "getCacheLimit()")
10481048
protected boolean isMemberReadable(Object receiver, Object name,
@@ -1052,7 +1052,7 @@ protected boolean isMemberReadable(Object receiver, Object name,
10521052
}
10531053
}
10541054

1055-
@CoreMethod(names = "is_member_modifiable?", onSingleton = true, required = 2)
1055+
@CoreMethod(names = "member_modifiable?", onSingleton = true, required = 2)
10561056
public abstract static class IsMemberModifiableNode extends InteropCoreMethodArrayArgumentsNode {
10571057
@Specialization(limit = "getCacheLimit()")
10581058
protected boolean isMemberModifiable(Object receiver, Object name,
@@ -1062,7 +1062,7 @@ protected boolean isMemberModifiable(Object receiver, Object name,
10621062
}
10631063
}
10641064

1065-
@CoreMethod(names = "is_member_insertable?", onSingleton = true, required = 2)
1065+
@CoreMethod(names = "member_insertable?", onSingleton = true, required = 2)
10661066
public abstract static class IsMemberInsertableNode extends InteropCoreMethodArrayArgumentsNode {
10671067
@Specialization(limit = "getCacheLimit()")
10681068
protected boolean isMemberInsertable(Object receiver, Object name,
@@ -1072,7 +1072,7 @@ protected boolean isMemberInsertable(Object receiver, Object name,
10721072
}
10731073
}
10741074

1075-
@CoreMethod(names = "is_member_removable?", onSingleton = true, required = 2)
1075+
@CoreMethod(names = "member_removable?", onSingleton = true, required = 2)
10761076
public abstract static class IsMemberRemovableNode extends InteropCoreMethodArrayArgumentsNode {
10771077
@Specialization(limit = "getCacheLimit()")
10781078
protected boolean isMemberRemovable(Object receiver, Object name,
@@ -1082,7 +1082,7 @@ protected boolean isMemberRemovable(Object receiver, Object name,
10821082
}
10831083
}
10841084

1085-
@CoreMethod(names = "is_member_invocable?", onSingleton = true, required = 2)
1085+
@CoreMethod(names = "member_invocable?", onSingleton = true, required = 2)
10861086
public abstract static class IsMemberInvocableNode extends InteropCoreMethodArrayArgumentsNode {
10871087
@Specialization(limit = "getCacheLimit()")
10881088
protected boolean isMemberInvocable(Object receiver, Object name,
@@ -1092,7 +1092,7 @@ protected boolean isMemberInvocable(Object receiver, Object name,
10921092
}
10931093
}
10941094

1095-
@CoreMethod(names = "is_member_internal?", onSingleton = true, required = 2)
1095+
@CoreMethod(names = "member_internal?", onSingleton = true, required = 2)
10961096
public abstract static class IsMemberInternalNode extends InteropCoreMethodArrayArgumentsNode {
10971097
@Specialization(limit = "getCacheLimit()")
10981098
protected boolean isMemberInternal(Object receiver, Object name,
@@ -1102,7 +1102,7 @@ protected boolean isMemberInternal(Object receiver, Object name,
11021102
}
11031103
}
11041104

1105-
@CoreMethod(names = "is_member_writable?", onSingleton = true, required = 2)
1105+
@CoreMethod(names = "member_writable?", onSingleton = true, required = 2)
11061106
public abstract static class IsMemberWritableNode extends InteropCoreMethodArrayArgumentsNode {
11071107
@Specialization(limit = "getCacheLimit()")
11081108
protected boolean isMemberWritable(Object receiver, Object name,
@@ -1112,7 +1112,7 @@ protected boolean isMemberWritable(Object receiver, Object name,
11121112
}
11131113
}
11141114

1115-
@CoreMethod(names = "is_member_existing?", onSingleton = true, required = 2)
1115+
@CoreMethod(names = "member_existing?", onSingleton = true, required = 2)
11161116
public abstract static class IsMemberExistingNode extends InteropCoreMethodArrayArgumentsNode {
11171117
@Specialization(limit = "getCacheLimit()")
11181118
protected boolean isMemberExisting(Object receiver, Object name,
@@ -1277,7 +1277,7 @@ protected boolean isJavaClass(Object value) {
12771277
}
12781278
}
12791279

1280-
@CoreMethod(names = "is_java_map?", onSingleton = true, visibility = Visibility.PRIVATE, required = 1)
1280+
@CoreMethod(names = "java_map?", onSingleton = true, visibility = Visibility.PRIVATE, required = 1)
12811281
public abstract static class InteropIsJavaMapNode extends CoreMethodArrayArgumentsNode {
12821282
@Specialization
12831283
protected boolean isJavaMap(Object value) {

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -245,11 +245,11 @@ def self.foreign_is_a?(receiver, klass)
245245
end
246246

247247
private_class_method def self.basic_inspect_for(object)
248-
if is_string?(object)
248+
if string?(object)
249249
object.inspect
250250
elsif has_array_elements?(object)
251251
'[...]'
252-
elsif (java?(object) && is_java_map?(object)) || has_members?(object)
252+
elsif (java?(object) && java_map?(object)) || has_members?(object)
253253
'{...}'
254254
else
255255
object.inspect
@@ -259,7 +259,7 @@ def self.foreign_is_a?(receiver, klass)
259259
private_class_method def self.recursive_string_for(object)
260260
if has_array_elements?(object)
261261
'[...]'
262-
elsif java?(object) && is_java_map?(object) || has_members?(object)
262+
elsif java?(object) && java_map?(object) || has_members?(object)
263263
'{...}'
264264
else
265265
# This last case should not currently be hit, but could be if we extend inspect with new cases.
@@ -298,7 +298,7 @@ def self.foreign_is_a?(receiver, klass)
298298
array_or_map = true
299299
string << " [#{to_array(object).map { |e| basic_inspect_for e }.join(', ')}]"
300300
end
301-
if is_java_map?(object)
301+
if java_map?(object)
302302
array_or_map = true
303303
string << " {#{pairs_from_java_map(object).map { |k, v| "#{basic_inspect_for k}=>#{basic_inspect_for v}" }.join(', ')}}"
304304
end
@@ -334,7 +334,7 @@ def self.foreign_to_s(object)
334334
end
335335

336336
def self.foreign_to_str(object)
337-
# object = as_string object if is_string? object
337+
# object = as_string object if string? object
338338
object = Truffle::Interop.unbox_if_needed(object)
339339
if object.is_a?(String)
340340
object
@@ -408,7 +408,7 @@ def self.to_hash(object)
408408
end
409409

410410
def self.pairs_from_object(object)
411-
readable_members = members(object).select { |member| Truffle::Interop.is_member_readable?(object, member) }
411+
readable_members = members(object).select { |member| Truffle::Interop.member_readable?(object, member) }
412412
readable_members.map { |key| [key, object[key]] }
413413
end
414414

@@ -421,14 +421,14 @@ def self.unbox_if_needed(object)
421421
end
422422

423423
def self.boxed?(object)
424-
boolean?(object) || is_string?(object) || is_number?(object)
424+
boolean?(object) || string?(object) || number?(object)
425425
end
426426

427427
def self.unbox(object)
428428
return as_boolean object if boolean? object
429-
return as_string object if is_string? object
429+
return as_string object if string? object
430430

431-
if is_number?(object)
431+
if number?(object)
432432
return as_int object if fits_in_int? object
433433
return as_long object if fits_in_long? object
434434
return as_double object if fits_in_double? object
@@ -439,9 +439,9 @@ def self.unbox(object)
439439

440440
def self.unbox_without_conversion(object)
441441
return as_boolean object if boolean? object
442-
return as_string_without_conversion object if is_string? object
442+
return as_string_without_conversion object if string? object
443443

444-
if is_number?(object)
444+
if number?(object)
445445
return as_int object if fits_in_int? object
446446
return as_long object if fits_in_long? object
447447
return as_double object if fits_in_double? object

0 commit comments

Comments
 (0)