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

Commits on Oct 26, 2013

  1. Use $opal instead of Opal

    meh committed Oct 26, 2013
    Copy the full SHA
    87db58a View commit details
  2. Copy the full SHA
    ea4d2f0 View commit details
Showing with 25 additions and 26 deletions.
  1. +2 −2 corelib/array.rb
  2. +23 −24 corelib/enumerable.rb
4 changes: 2 additions & 2 deletions corelib/array.rb
Original file line number Diff line number Diff line change
@@ -525,7 +525,7 @@ def each(&block)

%x{
for (var i = 0, length = self.length; i < length; i++) {
var value = Opal.$yield1(block, self[i]);
var value = $opal.$yield1(block, self[i]);
if (value == $breaker) {
return $breaker.$v;
@@ -541,7 +541,7 @@ def each_index(&block)

%x{
for (var i = 0, length = self.length; i < length; i++) {
var value = Opal.$yield1(block, i);
var value = $opal.$yield1(block, i);
if (value === $breaker) {
return $breaker.$v;
47 changes: 23 additions & 24 deletions corelib/enumerable.rb
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ def all?(&block)
if (block !== nil) {
self.$each._p = function() {
var value = Opal.$yieldX(block, arguments);
var value = $opal.$yieldX(block, arguments);
if (value === $breaker) {
result = $breaker.$v;
@@ -39,7 +39,7 @@ def any?(&block)
if (block !== nil) {
self.$each._p = function() {
var value = Opal.$yieldX(block, arguments);
var value = $opal.$yieldX(block, arguments);
if (value === $breaker) {
result = $breaker.$v;
@@ -74,7 +74,7 @@ def collect(&block)
var result = [];
self.$each._p = function() {
var value = Opal.$yieldX(block, arguments);
var value = $opal.$yieldX(block, arguments);
if (value === $breaker) {
result = $breaker.$v;
@@ -102,7 +102,7 @@ def reduce(object = undefined, &block)
return;
}
value = Opal.$yieldX(block, [result, value]);
value = $opal.$yieldX(block, [result, value]);
if (value === $breaker) {
result = $breaker.$v;
@@ -132,7 +132,7 @@ def count(object = undefined, &block)
}
self.$each._p = function() {
var value = Opal.$yieldX(block, arguments);
var value = $opal.$yieldX(block, arguments);
if (value === $breaker) {
result = $breaker.$v;
@@ -152,36 +152,35 @@ def count(object = undefined, &block)

def detect(ifnone = undefined, &block)
%x{
var result = nil;
var result = undefined;
#{self}.$each._p = function() {
var value;
var param = arguments.length == 1 ?
arguments[0] : $slice.call(arguments);
self.$each._p = function() {
var params = #{Opal.destructure(`arguments`)},
value = $opal.$yield1(block, params);
if ((value = block(param)) === $breaker) {
return $breaker.$v;
if (value === $breaker) {
result = $breaker.$v;
return $breaker;
}
if (value !== false && value !== nil) {
result = param;
$breaker.$v = nil;
if (#{Opal.truthy?(`value`)}) {
result = params;
return $breaker;
}
};
#{self}.$each();
if (result !== nil) {
return result;
}
self.$each();
if (typeof(ifnone) === 'function') {
return #{ifnone.call};
if (result === undefined && ifnone !== undefined) {
if (typeof(ifnone) === 'function') {
result = ifnone();
}
else {
result = ifnone;
}
}
return ifnone == null ? nil : ifnone;
return result === undefined ? nil : result;
}
end