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

Commits on Nov 4, 2014

  1. [Truffle] +@ should be defined on Numeric.

    @eregon
    eregon committed Nov 4, 2014
    Copy the full SHA
    4cc5aff View commit details

  2. [Truffle] Move #nonzero? to Numeric.

    @eregon
    eregon committed Nov 4, 2014
    Copy the full SHA
    850d9c8 View commit details

  3. [Truffle] Move #times to Numeric.

    @eregon
    eregon committed Nov 4, 2014
    Copy the full SHA
    35ee548 View commit details

  4. [Truffle] Add missing "take nodes intro account" lines.

    @eregon
    eregon committed Nov 4, 2014
    Copy the full SHA
    654fdb3 View commit details

  5. [Truffle] Move Fixnum methods belonging to Integer and Numeric.

    @eregon
    eregon committed Nov 4, 2014
    Copy the full SHA
    18b74c8 View commit details
2 changes: 2 additions & 0 deletions core/src/main/java/org/jruby/truffle/TruffleBridgeImpl.java
View file
Original file line number Diff line number Diff line change
@@ -73,13 +73,15 @@ public void init() {
CoreMethodNodeManager.addCoreMethodNodes(rubyObjectClass, FloatNodesFactory.getFactories());
CoreMethodNodeManager.addCoreMethodNodes(rubyObjectClass, HashNodesFactory.getFactories());
CoreMethodNodeManager.addCoreMethodNodes(rubyObjectClass, GCNodesFactory.getFactories());
CoreMethodNodeManager.addCoreMethodNodes(rubyObjectClass, IntegerNodesFactory.getFactories());
CoreMethodNodeManager.addCoreMethodNodes(rubyObjectClass, IONodesFactory.getFactories());
CoreMethodNodeManager.addCoreMethodNodes(rubyObjectClass, KernelNodesFactory.getFactories());
CoreMethodNodeManager.addCoreMethodNodes(rubyObjectClass, MainNodesFactory.getFactories());
CoreMethodNodeManager.addCoreMethodNodes(rubyObjectClass, MatchDataNodesFactory.getFactories());
CoreMethodNodeManager.addCoreMethodNodes(rubyObjectClass, MathNodesFactory.getFactories());
CoreMethodNodeManager.addCoreMethodNodes(rubyObjectClass, ModuleNodesFactory.getFactories());
CoreMethodNodeManager.addCoreMethodNodes(rubyObjectClass, NilClassNodesFactory.getFactories());
CoreMethodNodeManager.addCoreMethodNodes(rubyObjectClass, NumericNodesFactory.getFactories());
CoreMethodNodeManager.addCoreMethodNodes(rubyObjectClass, ObjectSpaceNodesFactory.getFactories());
CoreMethodNodeManager.addCoreMethodNodes(rubyObjectClass, ProcessNodesFactory.getFactories());
CoreMethodNodeManager.addCoreMethodNodes(rubyObjectClass, ProcNodesFactory.getFactories());
81 changes: 0 additions & 81 deletions core/src/main/java/org/jruby/truffle/nodes/core/BignumNodes.java
View file
Original file line number Diff line number Diff line change
@@ -25,24 +25,6 @@
@CoreClass(name = "Bignum")
public abstract class BignumNodes {

@CoreMethod(names = "+@")
public abstract static class PosNode extends CoreMethodNode {

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

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

@Specialization
public BigInteger pos(BigInteger value) {
return value;
}

}

@CoreMethod(names = "-@")
public abstract static class NegNode extends CoreMethodNode {

@@ -641,69 +623,6 @@ public Object leftShift(BigInteger a, int b) {

}

@CoreMethod(names = "nonzero?")
public abstract static class NonZeroNode extends CoreMethodNode {

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

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

@Specialization
public Object nonZero(BigInteger value) {
if (value.equals(BigInteger.ZERO)) {
return false;
} else {
return value;
}
}

}

@CoreMethod(names = "times", needsBlock = true)
public abstract static class TimesNode extends YieldingCoreMethodNode {

private final BranchProfile breakProfile = new BranchProfile();
private final BranchProfile nextProfile = new BranchProfile();
private final BranchProfile redoProfile = new BranchProfile();

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

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

@Specialization
public Object times(VirtualFrame frame, BigInteger n, RubyProc block) {
notDesignedForCompilation();

outer: for (BigInteger i = BigInteger.ZERO; i.compareTo(n) < 0; i = i.add(BigInteger.ONE)) {
while (true) {
try {
yield(frame, block, i);
continue outer;
} catch (BreakException e) {
breakProfile.enter();
return e.getResult();
} catch (NextException e) {
nextProfile.enter();
continue outer;
} catch (RedoException e) {
redoProfile.enter();
}
}
}

return n;
}

}

@CoreMethod(names = {"to_s", "inspect"})
public abstract static class ToSNode extends CoreMethodNode {

Loading