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

Commits on Oct 31, 2014

  1. Copy the full SHA
    50f3ae3 View commit details
  2. [Truffle] RUBY_ENGINE should be jrubytruffle!

    * Fix the new failures due to deviates_on.
    eregon committed Oct 31, 2014
    Copy the full SHA
    a7b51d9 View commit details
Original file line number Diff line number Diff line change
@@ -1203,6 +1203,11 @@ public int leftShift(int a, int b) {
}
}

@Specialization
public Object leftShiftWithOverflow(int a, int b) {
return leftShiftWithOverflow((long) a, b);
}

@Specialization(guards = "canShiftIntoLong")
public long leftShift(long a, int b) {
if (b > 0) {
Original file line number Diff line number Diff line change
@@ -195,7 +195,7 @@ public void initialize() {

objectClass.setConstant(null, "RUBY_VERSION", RubyString.fromJavaString(stringClass, "2.1.0"));
objectClass.setConstant(null, "RUBY_PATCHLEVEL", 0);
objectClass.setConstant(null, "RUBY_ENGINE", RubyString.fromJavaString(stringClass, "rubytruffle"));
objectClass.setConstant(null, "RUBY_ENGINE", RubyString.fromJavaString(stringClass, "jrubytruffle"));
objectClass.setConstant(null, "RUBY_PLATFORM", RubyString.fromJavaString(stringClass, "jvm"));

final LinkedHashMap<Object, Object> configHashMap = new LinkedHashMap<>();
2 changes: 1 addition & 1 deletion spec/truffle/tags/core/bignum/size_tags.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
fails:Bignum#size returns the number of bytes in the machine representation in multiples of four
fails:Bignum#size returns the number of bytes in the machine representation
3 changes: 2 additions & 1 deletion spec/truffle/tags/core/file/split_tags.txt
Original file line number Diff line number Diff line change
@@ -2,7 +2,8 @@ fails:File.split splits the string at the last '/' when the last component does
fails:File.split splits the string at the last '/' when the last component has an extension
fails:File.split splits an empty string into a '.' and an empty string
fails:File.split collapses multiple '/' characters and strips trailing ones
fails:File.split does not split a string that contains '\'
fails:File.split splits the string at the last '\' when the last component does not have an extension
fails:File.split splits the string at the last '\' when the last component has an extension
fails:File.split raises an ArgumentError when not passed a single argument
fails:File.split raises a TypeError if the argument is not a String type
fails:File.split coerces the argument with to_str if it is not a String type
1 change: 1 addition & 0 deletions spec/truffle/tags/core/fixnum/divmod_tags.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
fails:Fixnum#divmod returns an Array containing quotient and modulus obtained from dividing self by the given argument
fails:Fixnum#divmod raises a TypeError when given a non-Integer
fails:Fixnum#divmod raises a ZeroDivisionError when the given argument is 0 and a Float
2 changes: 0 additions & 2 deletions spec/truffle/tags/core/fixnum/left_shift_tags.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
fails:Fixnum#<< with n << m returns 0 when m < 0 and m is a Bignum
fails:Fixnum#<< with n << m returns a Bignum == fixnum_max() * 2 when fixnum_max() << 1 and n > 0
fails:Fixnum#<< with n << m returns a Bignum == fixnum_min() * 2 when fixnum_min() << 1 and n < 0
fails:Fixnum#<< with n << m calls #to_int to convert the argument to an Integer
fails:Fixnum#<< with n << m raises a TypeError when #to_int does not return an Integer
1 change: 1 addition & 0 deletions spec/truffle/tags/core/float/constants_tags.txt
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@ fails:Float#CONSTANTS the MAX_EXP is 1024
fails:Float#CONSTANTS the MIN_EXP is -1021
fails:Float#CONSTANTS the MAX is 1.79769313486232e+308
fails:Float#CONSTANTS the MIN is 2.2250738585072e-308
fails:Float#CONSTANTS the MIN is 4.9e-324
fails:Float#CONSTANTS the RADIX is 2
fails:Float#CONSTANTS the INFINITY is the positive infinity
fails:Float#CONSTANTS the NAN is 'not a number'
1 change: 1 addition & 0 deletions spec/truffle/tags/core/kernel/eval_tags.txt
Original file line number Diff line number Diff line change
@@ -26,3 +26,4 @@ fails:Kernel#eval does not pass the block to the method being eval'ed
fails:Kernel#eval returns from the scope calling #eval when evaluating 'return'
fails:Kernel#eval unwinds through a Proc-style closure and returns from a lambda-style closure in the closure chain
fails:Kernel#eval raises a LocalJumpError if there is no lambda-style closure in the chain
fails:Kernel#eval can be aliased