Skip to content

Commit

Permalink
[Truffle] Fix conversions to boolean.
Browse files Browse the repository at this point in the history 
* The Ruby rules are fairly simple so jsut use a simple method.
  A node could potentially avoid the explicit instanceof check though.
* Remove extra #! methods on true and false as well as unused yieldBoolean().
  • Loading branch information
@eregon
eregon committed Nov 3, 2014
1 parent 1495127 commit 2bdcc68
Show file tree
Hide file tree
Showing 16 changed files with 57 additions and 125 deletions.
4 changes: 1 addition & 3 deletions core/src/main/java/org/jruby/truffle/nodes/control/WhenSplatNode.java
View file
Expand Up @@ -45,9 +45,7 @@ public boolean executeBoolean(VirtualFrame frame) {
}

for (Object value : array.slowToArray()) {
// TODO(CS): how to cast this to a boolean?

if ((boolean) dispatchCaseEqual.call(frame, caseExpression, "===", null, value)) {
if (dispatchCaseEqual.callIsTruthy(frame, caseExpression, "===", null, value)) {
return true;
}
}
Expand Down
35 changes: 16 additions & 19 deletions core/src/main/java/org/jruby/truffle/nodes/core/ArrayNodes.java
View file
Expand Up @@ -499,7 +499,7 @@ public boolean equal(VirtualFrame frame, RubyArray a, RubyArray b) {
final Object[] bs = b.slowToArray();

for (int n = 0; n < a.getSize(); n++) {
if (!(boolean)equals.call(frame, as[n], "==", null, bs[n])) {
if (!equals.callIsTruthy(frame, as[n], "==", null, bs[n])) {
return false;
}
}
Expand Down Expand Up @@ -911,7 +911,7 @@ public boolean allIntegerFixnum(VirtualFrame frame, RubyArray array, RubyProc bl
notDesignedForCompilation();

for (int n = 0; n < array.getSize(); n++) {
if (!yieldBoolean(frame, block, ((int[]) array.getStore())[n])) {
if (!yieldIsTruthy(frame, block, ((int[]) array.getStore())[n])) {
return false;
}
}
Expand All @@ -924,7 +924,7 @@ public boolean allLongFixnum(VirtualFrame frame, RubyArray array, RubyProc block
notDesignedForCompilation();

for (int n = 0; n < array.getSize(); n++) {
if (!yieldBoolean(frame, block, ((long[]) array.getStore())[n])) {
if (!yieldIsTruthy(frame, block, ((long[]) array.getStore())[n])) {
return false;
}
}
Expand All @@ -937,7 +937,7 @@ public boolean allFloat(VirtualFrame frame, RubyArray array, RubyProc block) {
notDesignedForCompilation();

for (int n = 0; n < array.getSize(); n++) {
if (!yieldBoolean(frame, block, ((double[]) array.getStore())[n])) {
if (!yieldIsTruthy(frame, block, ((double[]) array.getStore())[n])) {
return false;
}
}
Expand All @@ -950,7 +950,7 @@ public boolean allObject(VirtualFrame frame, RubyArray array, RubyProc block) {
notDesignedForCompilation();

for (int n = 0; n < array.getSize(); n++) {
if (!yieldBoolean(frame, block, ((Object[]) array.getStore())[n])) {
if (!yieldIsTruthy(frame, block, ((Object[]) array.getStore())[n])) {
return false;
}
}
Expand Down Expand Up @@ -981,7 +981,7 @@ public boolean allIntegerFixnum(VirtualFrame frame, RubyArray array, RubyProc bl
notDesignedForCompilation();

for (int n = 0; n < array.getSize(); n++) {
if (yieldBoolean(frame, block, ((int[]) array.getStore())[n])) {
if (yieldIsTruthy(frame, block, ((int[]) array.getStore())[n])) {
return true;
}
}
Expand All @@ -994,7 +994,7 @@ public boolean anyLongFixnum(VirtualFrame frame, RubyArray array, RubyProc block
notDesignedForCompilation();

for (int n = 0; n < array.getSize(); n++) {
if (yieldBoolean(frame, block, ((long[]) array.getStore())[n])) {
if (yieldIsTruthy(frame, block, ((long[]) array.getStore())[n])) {
return true;
}
}
Expand All @@ -1007,7 +1007,7 @@ public boolean anyFloat(VirtualFrame frame, RubyArray array, RubyProc block) {
notDesignedForCompilation();

for (int n = 0; n < array.getSize(); n++) {
if (yieldBoolean(frame, block, ((double[]) array.getStore())[n])) {
if (yieldIsTruthy(frame, block, ((double[]) array.getStore())[n])) {
return true;
}
}
Expand All @@ -1020,7 +1020,7 @@ public boolean anyObject(VirtualFrame frame, RubyArray array, RubyProc block) {
notDesignedForCompilation();

for (int n = 0; n < array.getSize(); n++) {
if (yieldBoolean(frame, block, ((Object[]) array.getStore())[n])) {
if (yieldIsTruthy(frame, block, ((Object[]) array.getStore())[n])) {
return true;
}
}
Expand Down Expand Up @@ -1599,7 +1599,7 @@ public Object findIntegerFixnum(VirtualFrame frame, RubyArray array, RubyProc bl
try {
final Object value = store[n];

if (yieldBoolean(frame, block, value)) {
if (yieldIsTruthy(frame, block, value)) {
return value;
}
} catch (BreakException e) {
Expand All @@ -1620,7 +1620,7 @@ public Object findLongFixnum(VirtualFrame frame, RubyArray array, RubyProc block
try {
final Object value = store[n];

if (yieldBoolean(frame, block, value)) {
if (yieldIsTruthy(frame, block, value)) {
return value;
}
} catch (BreakException e) {
Expand All @@ -1641,7 +1641,7 @@ public Object findFloat(VirtualFrame frame, RubyArray array, RubyProc block) {
try {
final Object value = store[n];

if (yieldBoolean(frame, block, value)) {
if (yieldIsTruthy(frame, block, value)) {
return value;
}
} catch (BreakException e) {
Expand All @@ -1662,7 +1662,7 @@ public Object findObject(VirtualFrame frame, RubyArray array, RubyProc block) {
try {
final Object value = store[n];

if (yieldBoolean(frame, block, value)) {
if (yieldIsTruthy(frame, block, value)) {
return value;
}
} catch (BreakException e) {
Expand Down Expand Up @@ -1761,7 +1761,6 @@ public boolean includeFixnum(VirtualFrame frame, RubyArray array, Object value)
for (int n = 0; n < array.getSize(); n++) {
final Object stored = store[n];

// TODO(CS): cast node around the dispatch
notDesignedForCompilation();

if (equalNode.executeSameOrEqual(frame, stored, value)) {
Expand Down Expand Up @@ -2817,7 +2816,7 @@ public Object rejectInPlaceObject(VirtualFrame frame, RubyArray array, RubyProc
int i = 0;

for (int n = 0; n < array.getSize(); n++) {
if (yieldBoolean(frame, block, store[n])) {
if (yieldIsTruthy(frame, block, store[n])) {
continue;
}

Expand Down Expand Up @@ -2924,10 +2923,9 @@ public Object selectObject(VirtualFrame frame, RubyArray array, RubyProc block)

final Object value = store[n];

// TODO(CS): cast to boolean?
notDesignedForCompilation();

if (yieldBoolean(frame, block, new Object[]{value})) {
if (yieldIsTruthy(frame, block, new Object[]{value})) {
selectedStore = arrayBuilder.append(selectedStore, selectedSize, value);
selectedSize++;
}
Expand Down Expand Up @@ -2958,10 +2956,9 @@ public Object selectFixnumInteger(VirtualFrame frame, RubyArray array, RubyProc

final Object value = store[n];

// TODO(CS): cast to boolean?
notDesignedForCompilation();

if ((boolean) yield(frame, block, value)) {
if (yieldIsTruthy(frame, block, value)) {
selectedStore = arrayBuilder.append(selectedStore, selectedSize, value);
selectedSize++;
}
Expand Down
9 changes: 4 additions & 5 deletions core/src/main/java/org/jruby/truffle/nodes/core/BasicObjectNodes.java
View file
Expand Up @@ -27,7 +27,7 @@
@CoreClass(name = "BasicObject")
public abstract class BasicObjectNodes {

@CoreMethod(names = "!", needsSelf = false)
@CoreMethod(names = "!")
public abstract static class NotNode extends CoreMethodNode {

public NotNode(RubyContext context, SourceSection sourceSection) {
Expand All @@ -39,8 +39,8 @@ public NotNode(NotNode prev) {
}

@Specialization
public boolean not() {
return false;
public boolean not(Object value) {
return !getContext().getCoreLibrary().isTruthy(value);
}

}
Expand All @@ -62,8 +62,7 @@ public NotEqualNode(NotEqualNode prev) {

@Specialization
public boolean equal(VirtualFrame frame, Object a, Object b) {
// TODO(CS): cast
return !(boolean) equalNode.call(frame, a, "==", null, b);
return !equalNode.callIsTruthy(frame, a, "==", null, b);
}

}
Expand Down
18 changes: 0 additions & 18 deletions core/src/main/java/org/jruby/truffle/nodes/core/FalseClassNodes.java
View file
Expand Up @@ -17,24 +17,6 @@
@CoreClass(name = "FalseClass")
public abstract class FalseClassNodes {

@CoreMethod(names = "!", needsSelf = false)
public abstract static class NotNode extends CoreMethodNode {

public NotNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
}

public NotNode(NotNode prev) {
super(prev);
}

@Specialization
public boolean not() {
return true;
}

}

@CoreMethod(names = {"==", "=~"}, needsSelf = false, required = 1)
public abstract static class EqualNode extends CoreMethodNode {

Expand Down
15 changes: 5 additions & 10 deletions core/src/main/java/org/jruby/truffle/nodes/core/HashNodes.java
View file
Expand Up @@ -67,8 +67,7 @@ public boolean equalObjectArray(VirtualFrame frame, RubyHash a, RubyHash b) {
}

for (int n = 0; n < aSize * 2; n++) {
// TODO(CS): cast
if (!(boolean) equalNode.call(frame, aStore[n], "==", null, bStore[n])) {
if (!equalNode.callIsTruthy(frame, aStore[n], "==", null, bStore[n])) {
return false;
}
}
Expand Down Expand Up @@ -231,8 +230,7 @@ public Object getObjectArray(VirtualFrame frame, RubyHash hash, Object key) {
final int size = hash.getStoreSize();

for (int n = 0; n < RubyHash.HASHES_SMALL; n++) {
// TODO(CS): cast
if (n < size && (boolean) eqlNode.call(frame, store[n * 2], "eql?", null, key)) {
if (n < size && eqlNode.callIsTruthy(frame, store[n * 2], "eql?", null, key)) {
return store[n * 2 + 1];
}
}
Expand Down Expand Up @@ -309,8 +307,7 @@ public Object setObjectArray(VirtualFrame frame, RubyHash hash, Object key, Obje
final int size = hash.getStoreSize();

for (int n = 0; n < RubyHash.HASHES_SMALL; n++) {
// TODO(CS): cast
if (n < size && (boolean) eqlNode.call(frame, store[n * 2], "eql?", null, key)) {
if (n < size && eqlNode.callIsTruthy(frame, store[n * 2], "eql?", null, key)) {
store[n * 2 + 1] = value;
return value;
}
Expand Down Expand Up @@ -837,8 +834,7 @@ public RubyHash mergeObjectArrayObjectArray(VirtualFrame frame, RubyHash hash, R

for (int b = 0; b < RubyHash.HASHES_SMALL; b++) {
if (b < storeBSize) {
// TODO(CS): cast
if ((boolean) eqlNode.call(frame, storeA[a * 2], "eql?", null, storeB[b * 2])) {
if (eqlNode.callIsTruthy(frame, storeA[a * 2], "eql?", null, storeB[b * 2])) {
merge = false;
break;
}
Expand Down Expand Up @@ -926,8 +922,7 @@ public boolean keyObjectArray(VirtualFrame frame, RubyHash hash, Object key) {
final Object[] store = (Object[]) hash.getStore();

for (int n = 0; n < store.length; n += 2) {
// TODO(CS): cast
if ((boolean) eqlNode.call(frame, store[n], "eql?", null, key)) {
if (eqlNode.callIsTruthy(frame, store[n], "eql?", null, key)) {
return true;
}
}
Expand Down
3 changes: 1 addition & 2 deletions core/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
View file
Expand Up @@ -67,8 +67,7 @@ public SameOrEqualNode(SameOrEqualNode prev) {
public boolean sameOrEqual(VirtualFrame frame, Object a, Object b) {
if (referenceEqualNode.executeEqual(frame, a, b))
return true;
// TODO(CS): cast
return (boolean) equalNode.call(frame, a, "==", null, b);
return equalNode.callIsTruthy(frame, a, "==", null, b);
}

}
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/java/org/jruby/truffle/nodes/core/RangeNodes.java
View file
Expand Up @@ -234,16 +234,16 @@ public boolean include(RubyRange.IntegerFixnumRange range, int value) {
public boolean include(VirtualFrame frame, RubyRange.ObjectRange range, Object value) {
notDesignedForCompilation();

if ((boolean) callLess.call(frame, value, "<", null, range.getBegin())) {
if (callLess.callIsTruthy(frame, value, "<", null, range.getBegin())) {
return false;
}

if (range.doesExcludeEnd()) {
if ((boolean) callGreaterEqual.call(frame, value, ">=", null, range.getEnd())) {
if (callGreaterEqual.callIsTruthy(frame, value, ">=", null, range.getEnd())) {
return false;
}
} else {
if ((boolean) callGreater.call(frame, value, ">", null, range.getEnd())) {
if (callGreater.callIsTruthy(frame, value, ">", null, range.getEnd())) {
return false;
}
}
Expand Down
18 changes: 0 additions & 18 deletions core/src/main/java/org/jruby/truffle/nodes/core/TrueClassNodes.java
View file
Expand Up @@ -17,24 +17,6 @@
@CoreClass(name = "TrueClass")
public abstract class TrueClassNodes {

@CoreMethod(names = "!", needsSelf = false)
public abstract static class NotNode extends CoreMethodNode {

public NotNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
}

public NotNode(NotNode prev) {
super(prev);
}

@Specialization
public boolean not() {
return false;
}

}

@CoreMethod(names = {"==", "=~"}, needsSelf = false, required = 1)
public abstract static class EqualNode extends CoreMethodNode {

Expand Down
6 changes: 2 additions & 4 deletions core/src/main/java/org/jruby/truffle/nodes/core/YieldingArrayCoreMethodNode.java
View file
Expand Up @@ -36,10 +36,8 @@ public Object yield(VirtualFrame frame, RubyProc block, Object... arguments) {
return dispatchNode.dispatch(frame, block, arguments);
}

public boolean yieldBoolean(VirtualFrame frame, RubyProc block, Object... arguments) {
// TODO(CS): this should be a node!
RubyNode.notDesignedForCompilation();
return RubyTrueClass.toBoolean(yield(frame, block, arguments));
public boolean yieldIsTruthy(VirtualFrame frame, RubyProc block, Object... arguments) {
return getContext().getCoreLibrary().isTruthy(yield(frame, block, arguments));
}

}
5 changes: 0 additions & 5 deletions core/src/main/java/org/jruby/truffle/nodes/core/YieldingCoreMethodNode.java
View file
Expand Up @@ -34,9 +34,4 @@ public Object yield(VirtualFrame frame, RubyProc block, Object... arguments) {
return dispatchNode.dispatch(frame, block, arguments);
}

public boolean yieldBoolean(VirtualFrame frame, RubyProc block, Object... arguments) {
// TODO(CS): this should be a node!
return RubyTrueClass.toBoolean(dispatchNode.dispatch(frame, block, arguments));
}

}
6 changes: 0 additions & 6 deletions core/src/main/java/org/jruby/truffle/nodes/core/YieldingHashCoreMethodNode.java
View file
Expand Up @@ -36,10 +36,4 @@ public Object yield(VirtualFrame frame, RubyProc block, Object... arguments) {
return dispatchNode.dispatch(frame, block, arguments);
}

public boolean yieldBoolean(VirtualFrame frame, RubyProc block, Object... arguments) {
// TODO(CS): this should be a node!
RubyNode.notDesignedForCompilation();
return RubyTrueClass.toBoolean(yield(frame, block, arguments));
}

}
13 changes: 11 additions & 2 deletions core/src/main/java/org/jruby/truffle/nodes/dispatch/DispatchHeadNode.java
View file
Expand Up @@ -68,6 +68,15 @@ public Object call(
Dispatch.DispatchAction.CALL_METHOD);
}

public boolean callIsTruthy(
VirtualFrame frame,
Object receiverObject,
Object methodName,
RubyProc blockObject,
Object... argumentsObjects) {
return context.getCoreLibrary().isTruthy(call(frame, receiverObject, methodName, blockObject, argumentsObjects));
}

public double callFloat(
VirtualFrame frame,
Object receiverObject,
Expand Down Expand Up @@ -142,15 +151,15 @@ public boolean doesRespondTo(
VirtualFrame frame,
Object methodName,
Object receiverObject) {
return (boolean) dispatch(
return context.getCoreLibrary().isTruthy(dispatch(
frame,
context.getCoreLibrary().getNilObject(),
null, // TODO(eregon): was RubyArguments.getSelf(frame.getArguments()),
receiverObject,
methodName,
null,
null,
Dispatch.DispatchAction.RESPOND_TO_METHOD);
Dispatch.DispatchAction.RESPOND_TO_METHOD));
}

public Object dispatch(
Expand Down

0 comments on commit 2bdcc68

Please sign in to comment.