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: ce21a14ab6f9
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d9466e81f293
Choose a head ref
  • 19 commits
  • 20 files changed
  • 3 contributors

Commits on Aug 11, 2016

  1. [Truffle] Better error messages when a cext init function is not foun…

    …d, or is the wrong type.
    chrisseaton committed Aug 11, 2016
    Copy the full SHA
    936f0ed View commit details
  2. [Truffle] More flexible regexp for Truffle version.

    * They do not have -SNAPSHOT appended, just the commit hash.
    eregon committed Aug 11, 2016
    Copy the full SHA
    7da5ee2 View commit details
  3. Copy the full SHA
    fc644c7 View commit details
  4. Copy the full SHA
    6ebc681 View commit details
  5. [Truffle] Set the proper instanceFactory when copying classes.

    * Always copy the superclass.
    eregon committed Aug 11, 2016
    Copy the full SHA
    44e131b View commit details
  6. Copy the full SHA
    542368f View commit details
  7. Copy the full SHA
    af436d6 View commit details
  8. Copy the full SHA
    732d503 View commit details
  9. Copy the full SHA
    d70dfcb View commit details
  10. Copy the full SHA
    16a95c3 View commit details
  11. Copy the full SHA
    f8555f4 View commit details
  12. Ensure to use -e for -e specs

    eregon committed Aug 11, 2016
    Copy the full SHA
    02d87ae View commit details
  13. Copy the full SHA
    74c6b08 View commit details
  14. Copy the full SHA
    68cad24 View commit details
  15. [Truffle] Handle Bignum in sprintf Integer format

    Brandon Fish committed Aug 11, 2016
    2
    Copy the full SHA
    a7ff062 View commit details
  16. Copy the full SHA
    72b8307 View commit details
  17. Copy the full SHA
    887c928 View commit details

Commits on Aug 13, 2016

  1. Copy the full SHA
    c8eb4b5 View commit details
  2. Copy the full SHA
    d9466e8 View commit details
4 changes: 2 additions & 2 deletions spec/ruby/command_line/dash_e_spec.rb
Original file line number Diff line number Diff line change
@@ -10,11 +10,11 @@
end

it "uses 'main' as self" do
ruby_exe("puts self").chomp.should == "main"
ruby_exe("puts self", escape: false).chomp.should == "main"
end

it "uses '-e' as file" do
ruby_exe("puts __FILE__").chomp.should == "-e"
ruby_exe("puts __FILE__", escape: false).chomp.should == "-e"
end

#needs to test return => LocalJumpError
2 changes: 1 addition & 1 deletion spec/ruby/command_line/rubyopt_spec.rb
Original file line number Diff line number Diff line change
@@ -55,7 +55,7 @@
it "requires the file for '-r'" do
f = fixture __FILE__, "rubyopt"
ENV["RUBYOPT"] = "-r#{f}"
ruby_exe("").should =~ /^rubyopt.rb required/
ruby_exe("0", args: '2>&1').should =~ /^rubyopt.rb required/
end

it "raises a RuntimeError for '-a'" do
11 changes: 11 additions & 0 deletions spec/ruby/core/time/dup_spec.rb
Original file line number Diff line number Diff line change
@@ -25,4 +25,15 @@
t.should be_an_instance_of(c)
t.dup.should be_an_instance_of(c)
end

it "returns a clone of Time instance" do
c = Time.dup
t = c.now

t.should be_an_instance_of(c)
t.should_not be_an_instance_of(Time)

t.dup.should be_an_instance_of(c)
t.dup.should_not be_an_instance_of(Time)
end
end
3 changes: 0 additions & 3 deletions spec/truffle/tags/core/string/modulo_tags.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
fails:String#% raises an ArgumentError for unused arguments when $DEBUG is true
fails:String#% supports float formats using %g
fails:String#% supports float formats using %G
fails:String#% supports octal formats using %o for negative numbers
fails:String#% raises an ArgumentError for huge precisions for %s
fails:String#% supports hex formats using %x for negative numbers
fails:String#% supports hex formats using %X for negative numbers
fails:String#% behaves as if calling Kernel#Float for %e arguments, when the passed argument does not respond to #to_ary
fails:String#% behaves as if calling Kernel#Float for %e arguments, when the passed argument is hexadecimal string
fails:String#% behaves as if calling Kernel#Float for %E arguments, when the passed argument does not respond to #to_ary
1 change: 1 addition & 0 deletions spec/truffle/tags/language/hash_tags.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
fails:Hash literal does not change encoding of literal string keys during creation
fails:Hash literal raises a TypeError if any splatted elements keys are not symbols
2 changes: 1 addition & 1 deletion tool/jruby_eclipse
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ home = Dir.home rescue "/home/#{`whoami`.chomp}"
M2REPO = "#{home}/.m2/repository"

TRUFFLE_VERSION = File.foreach("#{JRUBY}/truffle/pom.rb") { |line|
break $1 if /'truffle\.version' => '(\d+\.\d+|\h+-SNAPSHOT)'/ =~ line
break $1 if /'truffle\.version' => '((?:\d+\.\d+|\h+)(?:-SNAPSHOT)?)'/ =~ line
}

TRUFFLEJARS = %W[
11 changes: 8 additions & 3 deletions tool/jt.rb
Original file line number Diff line number Diff line change
@@ -42,6 +42,9 @@
SO = 'so'
end

# Expand GEM_HOME relative to cwd so it cannot be misinterpreted later.
ENV['GEM_HOME'] = File.expand_path(ENV['GEM_HOME']) if ENV['GEM_HOME']

LIBXML_HOME = ENV['LIBXML_HOME'] = ENV['LIBXML_HOME'] || '/usr'
LIBXML_LIB_HOME = ENV['LIBXML_LIB_HOME'] = ENV['LIBXML_LIB_HOME'] || "#{LIBXML_HOME}/lib"
LIBXML_INCLUDE = ENV['LIBXML_INCLUDE'] = ENV['LIBXML_INCLUDE'] || "#{LIBXML_HOME}/include/libxml2"
@@ -59,7 +62,7 @@ module Utilities

def self.truffle_version
File.foreach("#{JRUBY_DIR}/truffle/pom.rb") do |line|
if /'truffle\.version' => '(\d+\.\d+(?:-SNAPSHOT)?|\h+-SNAPSHOT)'/ =~ line
if /'truffle\.version' => '((?:\d+\.\d+|\h+)(?:-SNAPSHOT)?)'/ =~ line
break $1
end
end
@@ -672,8 +675,10 @@ def cextc(cext_dir, *clang_opts)
config_src = config['src']

src = replace_env_vars(config['src'])
# Expand relative to the cext directory
src = File.expand_path(src, cext_dir)
src = Dir[src]
src_files = Dir[src]
raise "No source files found in #{src}!" if src_files.empty?

config_cflags = config['cflags'] || ''
config_cflags = replace_env_vars(config_cflags)
@@ -692,7 +697,7 @@ def cextc(cext_dir, *clang_opts)

lls = []

src.each do |src|
src_files.each do |src|
ll = File.join(File.dirname(out), File.basename(src, '.*') + '.ll')

clang "-I#{SULONG_HOME}/include", '-Ilib/ruby/truffle/cext', '-S', '-emit-llvm', *config_cflags, *clang_opts, src, '-o', ll
Original file line number Diff line number Diff line change
@@ -244,7 +244,7 @@ private static CallTarget makeGenericMethod(RubyContext context, MethodDetails m
if (!isSafe(context, method.unsafe())) {
node = new UnsafeNode(context, sourceSection);
} else {
node = Translator.sequence(context, sourceSection, Arrays.asList(checkArity, methodNode));
node = Translator.sequence(context, sharedMethodInfo.getName(), sourceSection, Arrays.asList(checkArity, methodNode));
node = transformResult(method, node);
}

Loading