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

Commits on Jan 8, 2014

  1. Cleanup BasicObject#instance_eval

    @meh
    meh committed Jan 8, 2014
    Copy the full SHA
    2e2aa1e View commit details

  2. Cleanup Module#module_eval

    @meh
    meh committed Jan 8, 2014
    Copy the full SHA
    a67018a View commit details
Showing with 8 additions and 9 deletions.
  1. +2 −2 opal/corelib/basic_object.rb
  2. +6 −7 opal/corelib/module.rb
4 changes: 2 additions & 2 deletions opal/corelib/basic_object.rb
View file
Original file line number Diff line number Diff line change
@@ -41,12 +41,12 @@ def instance_eval(&block)
Kernel.raise ArgumentError, "no block given" unless block

%x{
var block_self = block._s,
var old = block._s,
result;
block._s = null;
result = block.call(self, self);
block._s = block_self;
block._s = old;
return result;
}
13 changes: 6 additions & 7 deletions opal/corelib/module.rb
View file
Original file line number Diff line number Diff line change
@@ -345,16 +345,15 @@ def extended(mod)
end

def module_eval(&block)
%x{
if (block === nil) {
throw new Error("no block given");
}
raise ArgumentError, 'no block given' unless block

var block_self = block._s, result;
%x{
var old = block._s,
result;
block._s = null;
result = block.call(#{self});
block._s = block_self;
result = block.call(self);
block._s = old;
return result;
}