Skip to content

Commit

Permalink
Use $ as runtime/helpers prefix instead of __ (fixes #337)
Browse files Browse the repository at this point in the history
  • Loading branch information
@adambeynon
adambeynon committed Aug 2, 2013
1 parent 269bb25 commit b9d8517
Show file tree
Hide file tree
Showing 11 changed files with 215 additions and 215 deletions.
46 changes: 23 additions & 23 deletions corelib/opal/array.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ def self.new(size = undefined, obj = nil, &block)
else {
for (var i = 0, value; i < size; i++) {
value = block(i);
if (value === __breaker) {
return __breaker.$v;
if (value === $breaker) {
return $breaker.$v;
}
arr[i] = block(i);
}
Expand Down Expand Up @@ -338,8 +338,8 @@ def collect(&block)
for (var i = 0, length = #{self}.length, value; i < length; i++) {
if ((value = block(#{self}[i])) === __breaker) {
return __breaker.$v;
if ((value = block(#{self}[i])) === $breaker) {
return $breaker.$v;
}
result.push(value);
Expand All @@ -352,8 +352,8 @@ def collect(&block)
def collect!(&block)
%x{
for (var i = 0, length = #{self}.length, val; i < length; i++) {
if ((val = block(#{self}[i])) === __breaker) {
return __breaker.$v;
if ((val = block(#{self}[i])) === $breaker) {
return $breaker.$v;
}
#{self}[i] = val;
Expand Down Expand Up @@ -460,8 +460,8 @@ def delete_at(index)
def delete_if(&block)
%x{
for (var i = 0, length = #{self}.length, value; i < length; i++) {
if ((value = block(#{self}[i])) === __breaker) {
return __breaker.$v;
if ((value = block(#{self}[i])) === $breaker) {
return $breaker.$v;
}
if (value !== false && value !== nil) {
Expand All @@ -488,7 +488,7 @@ def each(&block)
if block.arity > 0
%x{
for (var i = 0, length = #{self}.length; i < length; i++) {
if (block.apply(null, #{self}[i]._isArray ? #{self}[i] : [#{self}[i]]) === __breaker) return __breaker.$v;
if (block.apply(null, #{self}[i]._isArray ? #{self}[i] : [#{self}[i]]) === $breaker) return $breaker.$v;
}
}
else
Expand Down Expand Up @@ -628,8 +628,8 @@ def index(object=undefined, &block)
}
else if (block !== nil) {
for (var i = 0, length = #{self}.length, value; i < length; i++) {
if ((value = block(#{self}[i])) === __breaker) {
return __breaker.$v;
if ((value = block(#{self}[i])) === $breaker) {
return $breaker.$v;
}
if (value !== false && value !== nil) {
Expand Down Expand Up @@ -700,8 +700,8 @@ def join(sep = '')
def keep_if(&block)
%x{
for (var i = 0, length = #{self}.length, value; i < length; i++) {
if ((value = block(#{self}[i])) === __breaker) {
return __breaker.$v;
if ((value = block(#{self}[i])) === $breaker) {
return $breaker.$v;
}
if (value === false || value === nil) {
Expand Down Expand Up @@ -803,8 +803,8 @@ def reject(&block)
var result = [];
for (var i = 0, length = #{self}.length, value; i < length; i++) {
if ((value = block(#{self}[i])) === __breaker) {
return __breaker.$v;
if ((value = block(#{self}[i])) === $breaker) {
return $breaker.$v;
}
if (value === false || value === nil) {
Expand Down Expand Up @@ -849,8 +849,8 @@ def rindex(object = undefined, &block)
%x{
if (block !== nil) {
for (var i = #{self}.length - 1, value; i >= 0; i--) {
if ((value = block(#{self}[i])) === __breaker) {
return __breaker.$v;
if ((value = block(#{self}[i])) === $breaker) {
return $breaker.$v;
}
if (value !== false && value !== nil) {
Expand All @@ -877,8 +877,8 @@ def select(&block)
for (var i = 0, length = #{self}.length, item, value; i < length; i++) {
item = #{self}[i];
if ((value = block(item)) === __breaker) {
return __breaker.$v;
if ((value = block(item)) === $breaker) {
return $breaker.$v;
}
if (value !== false && value !== nil) {
Expand Down Expand Up @@ -952,8 +952,8 @@ def sort(&block)
if (block !== nil) {
var result = copy.sort(function(x, y) {
var result = block(x, y);
if (result === __breaker) {
t_break.push(__breaker.$v);
if (result === $breaker) {
t_break.push($breaker.$v);
}
if (result === nil) {
t_arg_error = true;
Expand Down Expand Up @@ -1029,8 +1029,8 @@ def take_while(&block)
for (var i = 0, length = #{self}.length, item, value; i < length; i++) {
item = #{self}[i];
if ((value = block(item)) === __breaker) {
return __breaker.$v;
if ((value = block(item)) === $breaker) {
return $breaker.$v;
}
if (value === false || value === nil) {
Expand Down
6 changes: 3 additions & 3 deletions corelib/opal/class.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def append_features(klass)
//}
if (klass._included_in) {
__opal.donate(klass, methods.slice(), true);
$opal.donate(klass, methods.slice(), true);
}
}

Expand Down Expand Up @@ -282,7 +282,7 @@ def define_method(name, method = undefined, &block)
block._s = null;
#{self}._proto[jsid] = block;
__opal.donate(#{self}, [jsid]);
$opal.donate(#{self}, [jsid]);
return null;
}
Expand Down Expand Up @@ -410,7 +410,7 @@ def to_s
end

def undef_method(symbol)
`__opal.add_stub_for(#{self}._proto, "$" + symbol)`
`$opal.add_stub_for(#{self}._proto, "$" + symbol)`
self
end
end

2 comments on commit b9d8517

@peter-leonov
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are all these changes a true handmade, or you just used a computer for a silly automatic text replacement? ;)

@adambeynon
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

vim: :%s/__/$. I did have to change 1 back though in parser.rb, but, close enough ^_^

Please sign in to comment.