Skip to content

Commit

Permalink
Merge branch 'master' into truffle-head
Browse files Browse the repository at this point in the history
@chrisseaton
chrisseaton committed Jan 25, 2016
2 parents f7a77b6 + 5441536 commit cb0634a
Showing 10 changed files with 138 additions and 30 deletions.
4 changes: 2 additions & 2 deletions core/src/main/java/org/jruby/RubyRational.java
View file
Original file line number Diff line number Diff line change
@@ -129,7 +129,7 @@ private RubyRational(Ruby runtime, IRubyObject clazz, IRubyObject num, IRubyObje
/** rb_rational_raw
*
*/
static RubyRational newRationalRaw(Ruby runtime, IRubyObject x, IRubyObject y) {
public static RubyRational newRationalRaw(Ruby runtime, IRubyObject x, IRubyObject y) {
return new RubyRational(runtime, runtime.getRational(), x, y);
}

@@ -150,7 +150,7 @@ static IRubyObject newRationalCanonicalize(ThreadContext context, IRubyObject x)
/** rb_rational_new
*
*/
static IRubyObject newRationalCanonicalize(ThreadContext context, IRubyObject x, IRubyObject y) {
public static IRubyObject newRationalCanonicalize(ThreadContext context, IRubyObject x, IRubyObject y) {
return canonicalizeInternal(context, context.runtime.getRational(), x, y);
}

6 changes: 5 additions & 1 deletion core/src/main/java/org/jruby/ext/bigdecimal/RubyBigDecimal.java
View file
Original file line number Diff line number Diff line change
@@ -423,12 +423,16 @@ private static RubyBigDecimal getVpValue19(ThreadContext context, IRubyObject v,
}

private static RubyBigDecimal getVpRubyObjectWithPrec19Inner(ThreadContext context, RubyRational value) {
return getVpRubyObjectWithPrec19Inner(context, value, getRoundingMode(context.runtime));
}

public static RubyBigDecimal getVpRubyObjectWithPrec19Inner(ThreadContext context, RubyRational value, RoundingMode roundingMode) {
BigDecimal numerator = BigDecimal.valueOf(RubyNumeric.num2long(value.numerator(context)));
BigDecimal denominator = BigDecimal.valueOf(RubyNumeric.num2long(value.denominator(context)));

int len = numerator.precision() + denominator.precision();
int pow = len / 4;
MathContext mathContext = new MathContext((pow + 1) * 4, getRoundingMode(context.runtime));
MathContext mathContext = new MathContext((pow + 1) * 4, roundingMode);

return new RubyBigDecimal(context.runtime, numerator.divide(denominator, mathContext));
}
1 change: 1 addition & 0 deletions spec/truffle/tags/library/bigdecimal/add_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
fails:BigDecimal#add raises ArgumentError when precision parameter is negative
fails:BigDecimal#add raises TypeError when adds nil
2 changes: 2 additions & 0 deletions spec/truffle/tags/library/bigdecimal/divmod_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
fails:BigDecimal#mod_part_of_divmod raises TypeError if the argument cannot be coerced to BigDecimal
fails:BigDecimal#divmod raises TypeError if the argument cannot be coerced to BigDecimal
2 changes: 2 additions & 0 deletions spec/truffle/tags/library/bigdecimal/modulo_tags.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
fails:BigDecimal#% raises TypeError if the argument cannot be coerced to BigDecimal
fails:BigDecimal#modulo raises TypeError if the argument cannot be coerced to BigDecimal
1 change: 1 addition & 0 deletions test/mri/excludes/TestZlibGzipFile.rb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
exclude :test_mtime, "flaky"
1 change: 0 additions & 1 deletion tool/jruby_eclipse
View file
Original file line number Diff line number Diff line change
@@ -46,7 +46,6 @@ bootclasspath = []
classpath = []

bootclasspath << "#{JRUBY}/lib/jruby.jar"
classpath << "#{JRUBY}/lib/jruby-stdlib-9.0.0.0-SNAPSHOT.jar"
if rest.include?('-X+T')
bootclasspath += TRUFFLEJARS
classpath << SNAKEYAMLJAR
5 changes: 5 additions & 0 deletions truffle/src/main/java/org/jruby/truffle/nodes/core/BignumNodes.java
View file
Original file line number Diff line number Diff line change
@@ -136,6 +136,11 @@ public Object mul(DynamicObject a, DynamicObject b) {
return fixnumOrBignum(Layouts.BIGNUM.getValue(a).multiply(Layouts.BIGNUM.getValue(b)));
}

@Specialization(guards = {"!isInteger(b)", "!isLong(b)", "!isDouble(b)", "!isRubyBignum(b)"})
public Object mul(VirtualFrame frame, DynamicObject a, Object b) {
return ruby(frame, "redo_coerced :*, other", "other", b);
}

}

@CoreMethod(names = {"/", "__slash__"}, required = 1)
7 changes: 7 additions & 0 deletions truffle/src/main/java/org/jruby/truffle/nodes/core/FixnumOrBignumNode.java
View file
Original file line number Diff line number Diff line change
@@ -9,6 +9,7 @@
*/
package org.jruby.truffle.nodes.core;

import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.utilities.ConditionProfile;
@@ -40,6 +41,12 @@ public FixnumOrBignumNode(RubyContext context, SourceSection sourceSection) {
private final ConditionProfile integerFromDoubleProfile = ConditionProfile.createBinaryProfile();
private final ConditionProfile longFromDoubleProfile = ConditionProfile.createBinaryProfile();

public Object fixnumOrBignum(BigDecimal value) {
CompilerDirectives.transferToInterpreter();

return fixnumOrBignum(value.toBigInteger());
}

public Object fixnumOrBignum(BigInteger value) {
if (lowerProfile.profile(value.compareTo(LONG_MIN_BIGINT) >= 0 && value.compareTo(LONG_MAX_BIGINT) <= 0)) {
final long longValue = value.longValue();
139 changes: 113 additions & 26 deletions truffle/src/main/java/org/jruby/truffle/nodes/ext/BigDecimalNodes.java
View file
Original file line number Diff line number Diff line change
@@ -17,8 +17,12 @@
import com.oracle.truffle.api.utilities.ConditionProfile;
import com.oracle.truffle.api.source.SourceSection;
import org.jcodings.specific.UTF8Encoding;
import org.jruby.RubyBignum;
import org.jruby.RubyFixnum;
import org.jruby.RubyRational;
import org.jruby.ext.bigdecimal.RubyBigDecimal;
import org.jruby.runtime.Visibility;
import org.jruby.runtime.builtin.IRubyObject;
import org.jruby.truffle.nodes.RubyGuards;
import org.jruby.truffle.nodes.RubyNode;
import org.jruby.truffle.nodes.cast.BooleanCastNode;
@@ -251,7 +255,7 @@ public abstract static class CreateBigDecimalNode extends BigDecimalCoreMethodNo

public CreateBigDecimalNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
bigDecimalCast = BigDecimalCastNodeGen.create(context, sourceSection, null);
bigDecimalCast = BigDecimalCastNodeGen.create(context, sourceSection, null, null);
}

private void setBigDecimalValue(DynamicObject bigdecimal, BigDecimal value) {
@@ -282,7 +286,7 @@ public DynamicObject create(VirtualFrame frame, long value, DynamicObject self,
@Specialization
public DynamicObject create(VirtualFrame frame, long value, DynamicObject self, int digits) {
setBigDecimalValue(self,
bigDecimalCast.executeBigDecimal(frame, value).round(new MathContext(digits, getRoundMode(frame))));
bigDecimalCast.executeBigDecimal(frame, value, getRoundMode(frame)).round(new MathContext(digits, getRoundMode(frame))));
return self;
}

@@ -295,7 +299,7 @@ public DynamicObject create(VirtualFrame frame, double value, DynamicObject self
@Specialization
public DynamicObject create(VirtualFrame frame, double value, DynamicObject self, int digits) {
setBigDecimalValue(self,
bigDecimalCast.executeBigDecimal(frame, value).round(new MathContext(digits, getRoundMode(frame))));
bigDecimalCast.executeBigDecimal(frame, value, getRoundMode(frame)).round(new MathContext(digits, getRoundMode(frame))));
return self;
}

@@ -361,7 +365,7 @@ public DynamicObject createString(VirtualFrame frame, DynamicObject value, Dynam

@Specialization(guards = { "!isRubyBignum(value)", "!isRubyBigDecimal(value)", "!isRubyString(value)" })
public DynamicObject create(VirtualFrame frame, DynamicObject value, DynamicObject self, int digits) {
final Object castedValue = bigDecimalCast.executeObject(frame, value);
final Object castedValue = bigDecimalCast.executeObject(frame, value, getRoundMode(frame));
if (castedValue == nil()) {
throw new RaiseException(getContext().getCoreLibrary().typeError("could not be casted to BigDecimal", this));
}
@@ -1828,6 +1832,8 @@ public Object absSpecial(VirtualFrame frame, DynamicObject value) {
@CoreMethod(names = "round", optional = 2)
public abstract static class RoundNode extends BigDecimalCoreMethodArrayArgumentsNode {

@Child private FixnumOrBignumNode fixnumOrBignumNode;

public RoundNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
}
@@ -1849,7 +1855,12 @@ private BigDecimal round(DynamicObject value, int digit, RoundingMode roundingMo

@Specialization(guards = "isNormal(value)")
public Object round(VirtualFrame frame, DynamicObject value, NotProvided digit, NotProvided roundingMode) {
return createBigDecimal(frame, round(value, 0, getRoundMode(frame)));
if (fixnumOrBignumNode == null) {
CompilerDirectives.transferToInterpreter();
fixnumOrBignumNode = insert(FixnumOrBignumNode.create(getContext(), getSourceSection()));
}

return fixnumOrBignumNode.fixnumOrBignum(round(value, 0, getRoundMode(frame)));
}

@Specialization(guards = "isNormal(value)")
@@ -1864,6 +1875,11 @@ public Object round(VirtualFrame frame, DynamicObject value, int digit, int roun

@Specialization(guards = "!isNormal(value)")
public Object roundSpecial(VirtualFrame frame, DynamicObject value, NotProvided precision, Object unusedRoundingMode) {
if (fixnumOrBignumNode == null) {
CompilerDirectives.transferToInterpreter();
fixnumOrBignumNode = insert(FixnumOrBignumNode.create(getContext(), getSourceSection()));
}

switch (Layouts.BIG_DECIMAL.getType(value)) {
case NEGATIVE_INFINITY:
CompilerDirectives.transferToInterpreter();
@@ -1874,7 +1890,7 @@ public Object roundSpecial(VirtualFrame frame, DynamicObject value, NotProvided
throw new RaiseException(getContext().getCoreLibrary().
floatDomainError("Computation results to 'Infinity'", this));
case NEGATIVE_ZERO:
return value;
return fixnumOrBignumNode.fixnumOrBignum(Layouts.BIG_DECIMAL.getValue(value));
case NAN:
CompilerDirectives.transferToInterpreter();
throw new RaiseException(getContext().getCoreLibrary().
@@ -2063,52 +2079,108 @@ public int toISpecial(DynamicObject value) {
/**
* Casts a value into a BigDecimal.
*/
@NodeChild(value = "value", type = RubyNode.class)
@NodeChildren({
@NodeChild(value = "value", type = RubyNode.class),
@NodeChild(value = "roundingMode", type = RubyNode.class)
})
@ImportStatic(BigDecimalCoreMethodNode.class)
public abstract static class BigDecimalCastNode extends RubyNode {
public BigDecimalCastNode(RubyContext context, SourceSection sourceSection) {
super(context, sourceSection);
}

public abstract BigDecimal executeBigDecimal(VirtualFrame frame, Object value);
public abstract BigDecimal executeBigDecimal(VirtualFrame frame, Object value, RoundingMode roundingMode);

public abstract Object executeObject(VirtualFrame frame, Object value);
public abstract Object executeObject(VirtualFrame frame, Object value, RoundingMode roundingMode);

@Specialization
public BigDecimal doInt(long value) {
public BigDecimal doInt(long value, Object roundingMode) {
return BigDecimal.valueOf(value);
}

@Specialization
public BigDecimal doDouble(double value) {
public BigDecimal doDouble(double value, Object roundingMode) {
return BigDecimal.valueOf(value);
}

@Specialization(guards = "isRubyBignum(value)")
public BigDecimal doBignum(DynamicObject value) {
public BigDecimal doBignum(DynamicObject value, Object roundingMode) {
return new BigDecimal(Layouts.BIGNUM.getValue(value));
}

@Specialization(guards = "isNormalRubyBigDecimal(value)")
public BigDecimal doBigDecimal(DynamicObject value) {
public BigDecimal doBigDecimal(DynamicObject value, Object roundingMode) {
return Layouts.BIG_DECIMAL.getValue(value);
}

@Specialization(guards = { "!isRubyBignum(value)", "!isRubyBigDecimal(value)" })
public Object doOther(VirtualFrame frame, DynamicObject value) {
final Object result = ruby(
public Object doOther(VirtualFrame frame, DynamicObject value, Object roundingMode) {
if (roundingMode instanceof RoundingMode && (boolean) ruby(
frame,
"value.is_a?(Rational) ? value.to_f : nil",
"value", value);
if (result != nil()) {
return new BigDecimal((double) result);
"value.is_a?(Rational)",
"value", value)) {

final Object numerator = ruby(
frame,
"value.numerator",
"value", value);

final IRubyObject numeratorValue;

if (numerator instanceof Integer) {
numeratorValue = RubyFixnum.newFixnum(getContext().getRuntime(), (int) numerator);
} else if (numerator instanceof Long) {
numeratorValue = RubyFixnum.newFixnum(getContext().getRuntime(), (long) numerator);
} else if (RubyGuards.isRubyBignum(numerator)) {
numeratorValue = RubyBignum.newBignum(getContext().getRuntime(), Layouts.BIGNUM.getValue((DynamicObject) numerator));
} else {
throw new UnsupportedOperationException(numerator.toString());
}

final Object denominator = ruby(
frame,
"value.denominator",
"value", value);

final IRubyObject denominatorValue;

if (denominator instanceof Integer) {
denominatorValue = RubyFixnum.newFixnum(getContext().getRuntime(), (int) denominator);
} else if (denominator instanceof Long) {
denominatorValue = RubyFixnum.newFixnum(getContext().getRuntime(), (long) denominator);
} else if (RubyGuards.isRubyBignum(denominator)) {
denominatorValue = RubyBignum.newBignum(getContext().getRuntime(), Layouts.BIGNUM.getValue((DynamicObject) denominator));
} else {
throw new UnsupportedOperationException(denominator.toString());
}

final RubyRational rubyRationalValue = RubyRational.newRationalRaw(getContext().getRuntime(), numeratorValue, denominatorValue);

final RubyBigDecimal rubyBigDecimalValue;

try {
rubyBigDecimalValue = RubyBigDecimal.getVpRubyObjectWithPrec19Inner(getContext().getRuntime().getCurrentContext(), rubyRationalValue, (RoundingMode) roundingMode);
} catch (Exception e) {
e.printStackTrace();
throw e;
}

return rubyBigDecimalValue.getBigDecimalValue();
} else {
return result;
final Object result = ruby(
frame,
"value.to_f",
"value", value);
if (result != nil()) {
return new BigDecimal((double) result);
} else {
return result;
}
}
}

@Fallback
public Object doBigDecimalFallback(Object value) {
public Object doBigDecimalFallback(Object value, Object roundingMode) {
return nil();
}
// TODO (pitr 22-Jun-2015): How to better communicate failure without throwing
@@ -2119,7 +2191,8 @@ public Object doBigDecimalFallback(Object value) {
*/
@NodeChildren({
@NodeChild(value = "value", type = RubyNode.class),
@NodeChild(value = "cast", type = BigDecimalCastNode.class, executeWith = "value")
@NodeChild(value = "roundingMode", type = RoundModeNode.class),
@NodeChild(value = "cast", type = BigDecimalCastNode.class, executeWith = {"value", "roundingMode"})

})
public abstract static class BigDecimalCoerceNode extends RubyNode {
@@ -2131,7 +2204,8 @@ public BigDecimalCoerceNode(RubyContext context, SourceSection sourceSection) {

public static BigDecimalCoerceNode create(RubyContext context, SourceSection sourceSection, RubyNode value) {
return BigDecimalCoerceNodeGen.create(context, sourceSection, value,
BigDecimalCastNodeGen.create(context, sourceSection, null));
BigDecimalNodesFactory.RoundModeNodeFactory.create(context, sourceSection),
BigDecimalCastNodeGen.create(context, sourceSection, null, null));
}

private void setupCreateBigDecimal() {
@@ -2146,15 +2220,15 @@ protected DynamicObject createBigDecimal(VirtualFrame frame, Object value) {
return createBigDecimal.executeCreate(frame, value);
}

public abstract DynamicObject executeBigDecimal(VirtualFrame frame, Object value);
public abstract DynamicObject executeBigDecimal(VirtualFrame frame, RoundingMode roundingMode, Object value);

@Specialization
public DynamicObject doBigDecimal(VirtualFrame frame, Object value, BigDecimal cast) {
public DynamicObject doBigDecimal(VirtualFrame frame, Object value, RoundingMode roundingMode, BigDecimal cast) {
return createBigDecimal(frame, cast);
}

@Specialization(guards = { "isRubyBigDecimal(value)", "isNil(cast)" })
public Object doBigDecimal(DynamicObject value, DynamicObject cast) {
public Object doBigDecimal(DynamicObject value, RoundingMode roundingMode, DynamicObject cast) {
return value;
}

@@ -2176,4 +2250,17 @@ public DynamicObject allocate(DynamicObject rubyClass) {

}

public abstract static class RoundModeNode extends BigDecimalCoreMethodNode {

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

@Specialization
public RoundingMode doGetRoundMode(VirtualFrame frame) {
return getRoundMode(frame);
}

}

}

0 comments on commit cb0634a

Please sign in to comment.