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

Commits on Mar 17, 2015

  1. Copy the full SHA
    123c379 View commit details
  2. Copy the full SHA
    288b868 View commit details
  3. Copy the full SHA
    3ea1da0 View commit details
2 changes: 1 addition & 1 deletion bin/ast
Original file line number Diff line number Diff line change
@@ -193,7 +193,7 @@ def ir_setup(root)

builder = org.jruby.ir.IRBuilder

scope = builder.build_root(manager, root)
scope = builder.build_root(manager, root).scope
passes = manager.get_compiler_passes(scope)
[scope, passes]
end
3 changes: 1 addition & 2 deletions rakelib/rubyspec.rake
Original file line number Diff line number Diff line change
@@ -26,8 +26,7 @@ namespace :spec do
mspec :compile_mode => "JIT",
:jit_threshold => 0,
:format => 'd',
:spec_target => ":fast",
:jruby_opts => "--dev"
:spec_target => ":fast"c
end

desc "Run rubyspecs expected to pass"
2 changes: 0 additions & 2 deletions spec/tags/1.8/ruby/core/string/crypt_tags.txt

This file was deleted.

1 change: 0 additions & 1 deletion spec/tags/1.9/ruby/core/string/crypt_tags.txt

This file was deleted.

1 change: 1 addition & 0 deletions spec/tags/ruby/language/break_tags.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
fails:The break statement in a captured block when the invocation of the scope creating the block is still active raises a LocalJumpError when invoking the block from the scope creating the block
fails:The break statement in a captured block when the invocation of the scope creating the block is still active raises a LocalJumpError when invoking the block from a method
fails:The break statement in a captured block when the invocation of the scope creating the block is still active raises a LocalJumpError when yielding to the block
fails:The break statement in a captured block from a scope that has returned raises a LocalJumpError when calling the block from a method
3 changes: 3 additions & 0 deletions spec/tags/ruby/language/constants_tags.txt
Original file line number Diff line number Diff line change
@@ -2,3 +2,6 @@ fails:Module#private_constant marked constants in a module cannot be reopened as
fails:Module#private_constant marked constants in a module cannot be reopened as a class
fails:Module#private_constant marked constants in a class cannot be reopened as a module
fails:Module#private_constant marked constants in a class cannot be reopened as a class
fails(2.3 feature):Constant resolution within a singleton class (class << obj) uses its own namespace for each object
fails(2.3 feature):Constant resolution within a singleton class (class << obj) uses its own namespace for nested modules
fails(2.3 feature):Constant resolution within a singleton class (class << obj) allows nested modules to have proper resolution
2 changes: 1 addition & 1 deletion spec/truffle/tags/language/def_tags.txt
Original file line number Diff line number Diff line change
@@ -4,4 +4,4 @@ fails:A method definition inside an instance_eval creates a class method when th
fails:A method definition in an eval creates an instance method
fails:A method definition in an eval creates a class method
fails:A method definition in an eval creates a singleton method
fails:An instance method with a default argument does not call a method with the same name as the local
fails(2.2 parser change):An instance method with a default argument does not call a method with the same name as the local