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: 26b567560ca1
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0878ef089df7
Choose a head ref
  • 5 commits
  • 1 file changed
  • 1 contributor

Commits on Dec 2, 2014

  1. Remove never-implemented flag --indy. Fixes #2231.

    @headius
    headius committed Dec 2, 2014
    Copy the full SHA
    a30c537 View commit details

  2. Clean up block cloning for instance_eval and friends. 

    Conflicts:
	core/src/main/java/org/jruby/RubyBasicObject.java
	core/src/main/java/org/jruby/RubySymbol.java
    @headius
    headius committed Dec 2, 2014
    Copy the full SHA
    f568e2e View commit details

  3. Fully clone block + frame for instance_eval forms. 

    Fixes #1768 and #2060.
    @headius
    headius committed Dec 2, 2014
    Copy the full SHA
    17c67a6 View commit details

  4. Merge remote-tracking branch 'origin/jruby-1_7' 

    Conflicts:
	core/src/main/java/org/jruby/RubyBasicObject.java
	core/src/main/java/org/jruby/RubySymbol.java
	core/src/main/java/org/jruby/runtime/Block.java
	core/src/main/java/org/jruby/runtime/BlockBody.java
	core/src/main/java/org/jruby/runtime/CompiledSharedScopeBlock.java
	core/src/main/java/org/jruby/runtime/SharedScopeBlock.java
    @headius
    headius committed Dec 2, 2014
    Copy the full SHA
    425a90d View commit details

  5. Merge remote-tracking branch 'origin/master'

    @headius
    headius committed Dec 2, 2014
    Copy the full SHA
    0878ef0 View commit details
Showing with 6 additions and 1 deletion.
  1. +6 −1 core/src/main/java/org/jruby/runtime/Block.java
7 changes: 6 additions & 1 deletion core/src/main/java/org/jruby/runtime/Block.java
View file
Original file line number Diff line number Diff line change
@@ -184,7 +184,12 @@ public Block cloneBlockAndFrame() {
}

public Block cloneBlockForEval(IRubyObject self, EvalType evalType) {
Block block = cloneBlock();
Binding newBinding = new Binding(self, binding.getFrame().duplicate(), binding.getVisibility(), binding.getDynamicScope(), binding.getBacktrace());

Block block = new Block(body, newBinding);

block.type = type;
block.escapeBlock = this;

block.getBinding().setSelf(self);
block.getBinding().getFrame().setSelf(self);