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: 3a7397dece95
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b38c8f0e9584
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 31, 2014

  1. [Truffle] Fix Kernel#===.

    @eregon
    eregon committed Oct 31, 2014
    Copy the full SHA
    cc5e719 View commit details

  2. [Truffle] Rename ThreeEqualNode to CaseEqualNode.

    @eregon
    eregon committed Oct 31, 2014
    Copy the full SHA
    733cf82 View commit details

  3. [Truffle] Update Kernel#=== tags.

    @eregon
    eregon committed Oct 31, 2014

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b38c8f0 View commit details
Showing with 15 additions and 53 deletions.
  1. +15 −43 core/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
  2. +0 −10 spec/truffle/tags/core/kernel/case_compare_tags.txt
58 changes: 15 additions & 43 deletions core/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
View file
Original file line number Diff line number Diff line change
@@ -34,62 +34,34 @@
import org.jruby.truffle.runtime.core.RubyArray;
import org.jruby.truffle.runtime.core.RubyHash;
import org.jruby.truffle.runtime.methods.RubyMethod;
import org.jruby.truffle.runtime.subsystems.*;
import org.jruby.truffle.runtime.util.Supplier;
import org.jruby.util.ByteList;

@CoreClass(name = "Kernel")
public abstract class KernelNodes {

@CoreMethod(names = "===", required = 1)
public abstract static class ThreeEqualNode extends CoreMethodNode {
public abstract static class CaseEqualNode extends CoreMethodNode {

public ThreeEqualNode(RubyContext context, SourceSection sourceSection) {
@Child protected BasicObjectNodes.ReferenceEqualNode referenceEqualNode;
@Child protected DispatchHeadNode equalNode;

public CaseEqualNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
referenceEqualNode = BasicObjectNodesFactory.ReferenceEqualNodeFactory.create(context, sourceSection, new RubyNode[]{null, null});
equalNode = new DispatchHeadNode(context);
}

public ThreeEqualNode(ThreeEqualNode prev) {
public CaseEqualNode(CaseEqualNode prev) {
super(prev);
referenceEqualNode = prev.referenceEqualNode;
equalNode = prev.equalNode;
}

@Specialization
public boolean equal(@SuppressWarnings("unused") RubyNilClass a, @SuppressWarnings("unused") RubyNilClass b) {
return true;
}

@Specialization
public boolean equal(boolean a, boolean b) {
return a == b;
}

@Specialization
public boolean equal(int a, int b) {
return a == b;
}

@Specialization
public boolean equal(long a, long b) {
return a == b;
}

@Specialization
public boolean equal(double a, double b) {
return a == b;
}

@Specialization
public boolean equal(BigInteger a, BigInteger b) {
return a.compareTo(b) == 0;
}

@Specialization
public boolean equal(RubyBasicObject a, RubyBasicObject b) {
return a == b;
}

@Specialization
public boolean equal(RubyBasicObject a, boolean b) {
return false;
public boolean caseEqual(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);
}

}
10 changes: 0 additions & 10 deletions spec/truffle/tags/core/kernel/case_compare_tags.txt
View file

This file was deleted.