Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b0db8d9b6ff1
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5e523b5e7b60
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on May 11, 2016

  1. Copy the full SHA
    4fb9048 View commit details
  2. Copy the full SHA
    36e61fc View commit details
  3. Copy the full SHA
    5e523b5 View commit details
2 changes: 0 additions & 2 deletions spec/truffle/tags/truffle/interop/null_tags.txt

This file was deleted.

3 changes: 0 additions & 3 deletions spec/truffle/tags/truffle/interop/sizep_tags.txt

This file was deleted.

47 changes: 11 additions & 36 deletions truffle/src/main/java/org/jruby/truffle/interop/InteropNodes.java
Original file line number Diff line number Diff line change
@@ -189,7 +189,7 @@ public boolean hasSize(
}

protected Node createHasSizeNode() {
return Message.IS_EXECUTABLE.createNode();
return Message.HAS_SIZE.createNode();
}

}
@@ -288,41 +288,6 @@ public boolean isBoxed(Object receiver) {
@CoreMethod(names = "unbox", isModuleFunction = true, needsSelf = false, required = 1)
public abstract static class UnboxNode extends CoreMethodArrayArgumentsNode {

@Specialization
public boolean unbox(boolean receiver) {
return receiver;
}

@Specialization
public byte unbox(byte receiver) {
return receiver;
}

@Specialization
public short unbox(short receiver) {
return receiver;
}

@Specialization
public int unbox(int receiver) {
return receiver;
}

@Specialization
public long unbox(long receiver) {
return receiver;
}

@Specialization
public float unbox(float receiver) {
return receiver;
}

@Specialization
public double unbox(double receiver) {
return receiver;
}

@Specialization
public DynamicObject unbox(CharSequence receiver) {
// TODO CS-21-Dec-15 this shouldn't be needed - we need to convert j.l.String to Ruby's String automatically
@@ -349,6 +314,11 @@ protected Node createUnboxNode() {
return Message.UNBOX.createNode();
}

@Fallback
public Object unbox(Object receiver) {
return receiver;
}

}

@CoreMethod(names = "null?", isModuleFunction = true, needsSelf = false, required = 1)
@@ -366,6 +336,11 @@ protected Node createIsNullNode() {
return Message.IS_NULL.createNode();
}

@Fallback
public boolean isNull(Object receiver) {
return false;
}

}

@CoreMethod(names = "read", isModuleFunction = true, needsSelf = false, required = 2)