opal 0.5.5 → 0.6.0

data/opal/corelib/range.rb

@@ -1,3 +1,5 @@
+require 'corelib/enumerable'
+
 class Range
   include Enumerable
 

data/opal/corelib/rational.rb

@@ -0,0 +1,3 @@
+class Rational < Numeric
+
+end

data/opal/corelib/regexp.rb

@@ -1,16 +1,26 @@
 class Regexp
   `def._isRegexp = true`
 
-  def self.escape(string)
-    `string.replace(/[\\-\\[\\]\\/\\{\\}\\(\\)\\*\\+\\?\\.\\\\\^\\$\\| ]/g, '\\\\$&')`
-  end
+  class << self
+    def escape(string)
+      %x{
+        return string.replace(/([-[\]/{}()*+?.^$\\| ])/g, '\\$1')
+                     .replace(/[\n]/g, '\\n')
+                     .replace(/[\r]/g, '\\r')
+                     .replace(/[\f]/g, '\\f')
+                     .replace(/[\t]/g, '\\t');
+      }
+    end
 
-  def self.union(*parts)
-    `new RegExp(parts.join(''))`
-  end
+    alias quote escape
 
-  def self.new(regexp, options = undefined)
-    `new RegExp(regexp, options)`
+    def union(*parts)
+      `new RegExp(parts.join(''))`
+    end
+
+    def new(regexp, options = undefined)
+      `new RegExp(regexp, options)`
+    end
   end
 
   def ==(other)
@@ -18,15 +28,17 @@ class Regexp
   end
 
   def ===(str)
-    if `str._isString == null` && str.respond_to?(:to_str)
-      str = str.to_str
-    end
+    %x{
+      if (!str._isString && #{str.respond_to?(:to_str)}) {
+        #{str = str.to_str};
+      }
 
-    if `str._isString == null`
-      return false
-    end
+      if (!str._isString) {
+        return false;
+      }
 
-    `self.test(str)`
+      return self.test(str);
+    }
   end
 
   def =~(string)
@@ -69,7 +81,7 @@ class Regexp
     `self.toString()`
   end
 
-  def match(string, pos = undefined)
+  def match(string, pos = undefined, &block)
     if `string === nil`
       $~ = $` = $' = nil
 
@@ -98,7 +110,14 @@ class Regexp
       var result = re.exec(string);
 
       if (result) {
-        return #{$~ = MatchData.new(`re`, `result`)};
+        result = #{$~ = MatchData.new(`re`, `result`)};
+
+        if (block === nil) {
+          return result;
+        }
+        else {
+          return #{block.call(`result`)};
+        }
       }
       else {
         return #{$~ = $` = $' = nil};

data/opal/corelib/runtime.js

@@ -614,6 +614,12 @@
         return true;
       }
 
+      for (var i = 0, length = search.__inc__.length; i < length; i++) {
+        if (search.__inc__[i] == klass) {
+          return true;
+        }
+      }
+
       search = search._super;
     }
 
@@ -751,17 +757,26 @@
     hash.map   = assocs;
     hash.keys  = keys;
 
-    if (arguments.length == 1 && arguments[0]._isArray) {
-      var args = arguments[0];
+    if (arguments.length == 1) {
+      if (arguments[0]._isArray) {
+        var args = arguments[0];
 
-      for (var i = 0, length = args.length; i < length; i++) {
-        var key = args[i][0], obj = args[i][1];
+        for (var i = 0, length = args.length; i < length; i++) {
+          var key = args[i][0], obj = args[i][1];
 
-        if (assocs[key] == null) {
+          if (assocs[key] == null) {
+            keys.push(key);
+          }
+
+          assocs[key] = obj;
+        }
+      }
+      else {
+        var obj = arguments[0];
+        for (var key in obj) {
+          assocs[key] = obj[key];
           keys.push(key);
         }
-
-        assocs[key] = obj;
       }
     }
     else {

data/opal/corelib/string.rb

@@ -1,3 +1,5 @@
+require 'corelib/comparable'
+
 class String
   include Comparable
 
@@ -69,9 +71,12 @@ class String
   end
 
   def ==(other)
-    `!!(other._isString && self.valueOf() === other.valueOf())`
+    return false unless String === other
+
+    `#{to_s} == #{other.to_s}`
   end
 
+  alias eql? ==
   alias === ==
 
   def =~(other)
@@ -166,8 +171,10 @@ class String
     }
   end
 
-  def chars
-    each_char.to_a
+  def chars(&block)
+    return each_char.to_a unless block
+
+    each_char(&block)
   end
 
   def chomp(separator = $/)
@@ -176,14 +183,14 @@ class String
     separator = Opal.coerce_to!(separator, String, :to_str).to_s
 
     %x{
-      if (separator === "\\n") {
-        return self.replace(/\\r?\\n?$/, '');
+      if (separator === "\n") {
+        return self.replace(/\r?\n?$/, '');
       }
       else if (separator === "") {
-        return self.replace(/(\\r?\\n)+$/, '');
+        return self.replace(/(\r?\n)+$/, '');
       }
       else if (self.length > separator.length) {
-        var tail = self.substr(-1 * separator.length);
+        var tail = self.substr(self.length - separator.length, separator.length);
 
         if (tail === separator) {
           return self.substr(0, self.length - separator.length);
@@ -202,7 +209,7 @@ class String
         return "";
       }
 
-      if (self.charAt(length - 1) === "\\n" && self.charAt(length - 2) === "\\r") {
+      if (self.charAt(length - 1) === "\n" && self.charAt(length - 2) === "\r") {
         return self.substr(0, length - 2);
       }
       else {
@@ -216,7 +223,15 @@ class String
   end
 
   def clone
-    `self.slice()`
+    copy = `self.slice()`
+    copy.initialize_clone(self)
+    copy
+  end
+
+  def dup
+    copy = `self.slice()`
+    copy.initialize_dup(self)
+    copy
   end
 
   def count(str)
@@ -269,9 +284,10 @@ class String
   def end_with?(*suffixes)
     %x{
       for (var i = 0, length = suffixes.length; i < length; i++) {
-        var suffix = #{Opal.coerce_to `suffixes[i]`, String, :to_str};
+        var suffix = #{Opal.coerce_to(`suffixes[i]`, String, :to_str).to_s};
 
-        if (self.length >= suffix.length && self.substr(0 - suffix.length) === suffix) {
+        if (self.length >= suffix.length &&
+            self.substr(self.length - suffix.length, suffix.length) == suffix) {
           return true;
         }
       }
@@ -297,13 +313,13 @@ class String
           options = pattern.substr(pattern.lastIndexOf('/') + 1) + 'g',
           regexp  = pattern.substr(1, pattern.lastIndexOf('/') - 1);
 
-      #{self}.$sub._p = block;
-      return #{self}.$sub(new RegExp(regexp, options), replace);
+      self.$sub._p = block;
+      return self.$sub(new RegExp(regexp, options), replace);
     }
   end
 
   def hash
-    `#{self}.toString()`
+    `self.toString()`
   end
 
   def hex
@@ -376,15 +392,15 @@ class String
 
   def inspect
     %x{
-      var escapable = /[\\\\\\"\\x00-\\x1f\\x7f-\\x9f\\u00ad\\u0600-\\u0604\\u070f\\u17b4\\u17b5\\u200c-\\u200f\\u2028-\\u202f\\u2060-\\u206f\\ufeff\\ufff0-\\uffff]/g,
+      var escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
           meta      = {
-            '\\b': '\\\\b',
-            '\\t': '\\\\t',
-            '\\n': '\\\\n',
-            '\\f': '\\\\f',
-            '\\r': '\\\\r',
-            '"' : '\\\\"',
-            '\\\\': '\\\\\\\\'
+            '\b': '\\b',
+            '\t': '\\t',
+            '\n': '\\n',
+            '\f': '\\f',
+            '\r': '\\r',
+            '"' : '\\"',
+            '\\': '\\\\'
           };
 
       escapable.lastIndex = 0;
@@ -393,7 +409,7 @@ class String
         var c = meta[a];
 
         return typeof c === 'string' ? c :
-          '\\\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+          '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
       }) + '"' : '"' + self + '"';
     }
   end
@@ -435,7 +451,7 @@ class String
   end
 
   def lstrip
-    `self.replace(/^\\s*/, '')`
+    `self.replace(/^\s*/, '')`
   end
 
   def match(pattern, pos = undefined, &block)
@@ -452,32 +468,32 @@ class String
 
   def next
     %x{
-      if (#{self}.length === 0) {
+      if (self.length === 0) {
         return "";
       }
 
-      var initial = #{self}.substr(0, #{self}.length - 1);
-      var last    = String.fromCharCode(#{self}.charCodeAt(#{self}.length - 1) + 1);
+      var initial = self.substr(0, self.length - 1);
+      var last    = String.fromCharCode(self.charCodeAt(self.length - 1) + 1);
 
       return initial + last;
     }
   end
 
   def ord
-    `#{self}.charCodeAt(0)`
+    `self.charCodeAt(0)`
   end
 
   def partition(str)
     %x{
-      var result = #{self}.split(str);
-      var splitter = (result[0].length === #{self}.length ? "" : str);
+      var result = self.split(str);
+      var splitter = (result[0].length === self.length ? "" : str);
 
       return [result[0], splitter, result.slice(1).join(str.toString())];
     }
   end
 
   def reverse
-    `#{self}.split('').reverse().join('')`
+    `self.split('').reverse().join('')`
   end
 
   # TODO handle case where search is regexp
@@ -489,21 +505,21 @@ class String
         #{raise TypeError.new(`msg`)};
       }
 
-      if (#{self}.length == 0) {
+      if (self.length == 0) {
         return search.length == 0 ? 0 : nil;
       }
 
       var result = -1;
       if (offset != null) {
         if (offset < 0) {
-          offset = #{self}.length + offset;
+          offset = self.length + offset;
         }
 
         if (search_type == String) {
-          result = #{self}.lastIndexOf(search, offset);
+          result = self.lastIndexOf(search, offset);
         }
         else {
-          result = #{self}.substr(0, offset + 1).$reverse().search(search);
+          result = self.substr(0, offset + 1).$reverse().search(search);
           if (result !== -1) {
             result = offset - result;
           }
@@ -511,12 +527,12 @@ class String
       }
       else {
         if (search_type == String) {
-          result = #{self}.lastIndexOf(search);
+          result = self.lastIndexOf(search);
         }
         else {
-          result = #{self}.$reverse().search(search);
+          result = self.$reverse().search(search);
           if (result !== -1) {
-            result = #{self}.length - 1 - result;
+            result = self.length - 1 - result;
           }
         }
       }
@@ -546,7 +562,7 @@ class String
   end
 
   def rstrip
-    `self.replace(/\\s*$/, '')`
+    `self.replace(/\s*$/, '')`
   end
 
   def scan(pattern, &block)
@@ -563,17 +579,17 @@ class String
       var result = [];
       var match;
 
-      while ((match = pattern.exec(#{self})) != null) {
+      while ((match = pattern.exec(self)) != null) {
         var match_data = #{MatchData.new `pattern`, `match`};
         if (block === nil) {
           match.length == 1 ? result.push(match[0]) : result.push(match.slice(1));
         }
         else {
-          match.length == 1 ? block(match[0]) : block.apply(#{self}, match.slice(1));
+          match.length == 1 ? block(match[0]) : block.apply(self, match.slice(1));
         }
       }
 
-      return (block !== nil ? #{self} : result);
+      return (block !== nil ? self : result);
     }
   end
 
@@ -582,13 +598,101 @@ class String
   alias slice []
 
   def split(pattern = $; || ' ', limit = undefined)
-    `#{self}.split(pattern, limit)`
+    %x{
+      if (pattern && pattern._isRegexp) {
+          return self.split(pattern, limit);
+        } else {
+          result = [],
+          splitted = start = lim = 0,
+          splat = #{Opal.try_convert(pattern, String, :to_str).to_s};
+
+          if (undefined !== limit) {
+            lim = #{Opal.try_convert(limit, Integer, :to_int)};
+          }
+
+          if (pattern === nil) {
+            if (#{$;} === undefined || #{$;} === nil) {
+              splat = ' ';
+            }
+            else {
+              splat = #{$;};
+            }
+          }
+
+          if (lim == 1) {
+            if (self.length == 0) {
+              return [];
+            }
+            else {
+              return [self];
+            }
+          }
+
+          string = (splat == ' ') ? self.replace(/[\r\n\t\v]\s+/g, ' ')
+                                  : self;
+
+          while ((cursor = string.indexOf(splat, start)) > -1 && cursor < string.length) {
+            if (splitted + 1 == lim) {
+              break;
+            }
+
+            if (splat == ' ' && cursor == start) {
+              start = cursor + 1;
+              continue;
+            }
+
+            result.push(string.substr(start, splat.length ? cursor - start : 1));
+            splitted++;
+
+            start = cursor + (splat.length ? splat.length : 1);
+          }
+
+          if (string.length > 0 && (limit || lim < 0 || string.length > start)) {
+            if (string.length == start) {
+              result.push('');
+            }
+            else {
+              result.push(string.substr(start, string.length));
+            }
+          }
+
+          if (limit === undefined || lim == 0) {
+            while (result.length > 0 && result[result.length - 1].length == 0) {
+              result.pop();
+            }
+          }
+
+          return result;
+        }
+    }
+  end
+
+  def squeeze(*sets)
+    %x{
+      if (sets.length === 0) {
+        return self.replace(/(.)\1+/g, '$1');
+      }
+    }
+
+    %x{
+      var set = #{Opal.coerce_to(`sets[0]`, String, :to_str).chars};
+
+      for (var i = 1, length = sets.length; i < length; i++) {
+        set = #{`set` & Opal.coerce_to(`sets[i]`, String, :to_str).chars};
+      }
+
+      if (set.length === 0) {
+        return self;
+      }
+
+      return self.replace(new RegExp("([" + #{Regexp.escape(`set`.join)} + "])\\1+", "g"), "$1");
+    }
   end
 
   def start_with?(*prefixes)
     %x{
       for (var i = 0, length = prefixes.length; i < length; i++) {
-        var prefix = #{Opal.coerce_to `prefixes[i]`, String, :to_str};
+        var prefix = #{Opal.coerce_to(`prefixes[i]`, String, :to_str).to_s};
 
         if (self.indexOf(prefix) === 0) {
           return true;
@@ -600,18 +704,18 @@ class String
   end
 
   def strip
-    `#{self}.replace(/^\\s*/, '').replace(/\\s*$/, '')`
+    `self.replace(/^\s*/, '').replace(/\s*$/, '')`
   end
 
   def sub(pattern, replace = undefined, &block)
     %x{
       if (typeof(replace) === 'string') {
         // convert Ruby back reference to JavaScript back reference
-        replace = replace.replace(/\\\\([1-9])/g, '$$$1')
-        return #{self}.replace(pattern, replace);
+        replace = replace.replace(/\\([1-9])/g, '$$$1')
+        return self.replace(pattern, replace);
       }
       if (block !== nil) {
-        return #{self}.replace(pattern, function() {
+        return self.replace(pattern, function() {
           // FIXME: this should be a formal MatchData object with all the goodies
           var match_data = []
           for (var i = 0, len = arguments.length; i < len; i++) {
@@ -639,7 +743,7 @@ class String
       }
       else if (replace !== undefined) {
         if (#{replace.is_a?(Hash)}) {
-          return #{self}.replace(pattern, function(str) {
+          return self.replace(pattern, function(str) {
             var value = #{replace[str]};
 
             return (value == null) ? nil : #{value.to_s};
@@ -652,13 +756,13 @@ class String
             #{raise TypeError, "can't convert #{replace.class} into String"};
           }
 
-          return #{self}.replace(pattern, replace);
+          return self.replace(pattern, replace);
         }
       }
       else {
         // convert Ruby back reference to JavaScript back reference
-        replace = replace.toString().replace(/\\\\([1-9])/g, '$$$1')
-        return #{self}.replace(pattern, replace);
+        replace = replace.toString().replace(/\\([1-9])/g, '$$$1')
+        return self.replace(pattern, replace);
       }
     }
   end
@@ -669,8 +773,8 @@ class String
     %x{
       var result = 0;
 
-      for (var i = 0, length = #{self}.length; i < length; i++) {
-        result += (#{self}.charCodeAt(i) % ((1 << n) - 1));
+      for (var i = 0, length = self.length; i < length; i++) {
+        result += (self.charCodeAt(i) % ((1 << n) - 1));
       }
 
       return result;
@@ -679,11 +783,11 @@ class String
 
   def swapcase
     %x{
-      var str = #{self}.replace(/([a-z]+)|([A-Z]+)/g, function($0,$1,$2) {
+      var str = self.replace(/([a-z]+)|([A-Z]+)/g, function($0,$1,$2) {
         return $1 ? $0.toUpperCase() : $0.toLowerCase();
       });
 
-      if (#{self}.constructor === String) {
+      if (self.constructor === String) {
         return str;
       }
 
@@ -691,27 +795,26 @@ class String
     }
   end
 
-  def to_a
+  def to_f
     %x{
-      if (#{self}.length === 0) {
-        return [];
+      if (self.charAt(0) === '_') {
+        return 0;
       }
 
-      return [#{self}];
-    }
-  end
-
-  def to_f
-    %x{
-      var result = parseFloat(#{self});
+      var result = parseFloat(self.replace(/_/g, ''));
 
-      return isNaN(result) ? 0 : result;
+      if (isNaN(result) || result == Infinity || result == -Infinity) {
+        return 0;
+      }
+      else {
+        return result;
+      }
     }
   end
 
   def to_i(base = 10)
     %x{
-      var result = parseInt(#{self}, base);
+      var result = parseInt(self, base);
 
       if (isNaN(result)) {
         return 0;
@@ -723,7 +826,7 @@ class String
 
   def to_proc
     %x{
-      var name = '$' + #{self};
+      var name = '$' + self;
 
       return function(arg) {
         var meth = arg[name];
@@ -733,7 +836,7 @@ class String
   end
 
   def to_s
-    `#{self}.toString()`
+    `self.toString()`
   end
 
   alias to_str to_s
@@ -743,7 +846,7 @@ class String
   def tr(from, to)
     %x{
       if (from.length == 0 || from === to) {
-        return #{self};
+        return self;
       }
 
       var subs = {};
@@ -765,12 +868,12 @@ class String
       var last_from = null;
       var in_range = false;
       for (var i = 0; i < from_length; i++) {
-        var char = from_chars[i];
+        var ch = from_chars[i];
         if (last_from == null) {
-          last_from = char;
-          from_chars_expanded.push(char);
+          last_from = ch;
+          from_chars_expanded.push(ch);
         }
-        else if (char === '-') {
+        else if (ch === '-') {
           if (last_from === '-') {
             from_chars_expanded.push('-');
             from_chars_expanded.push('-');
@@ -784,16 +887,16 @@ class String
         }
         else if (in_range) {
           var start = last_from.charCodeAt(0) + 1;
-          var end = char.charCodeAt(0);
+          var end = ch.charCodeAt(0);
           for (var c = start; c < end; c++) {
             from_chars_expanded.push(String.fromCharCode(c));
           }
-          from_chars_expanded.push(char);
+          from_chars_expanded.push(ch);
           in_range = null;
           last_from = null;
         }
         else {
-          from_chars_expanded.push(char);
+          from_chars_expanded.push(ch);
         }
       }
 
@@ -811,12 +914,12 @@ class String
           var last_to = null;
           var in_range = false;
           for (var i = 0; i < to_length; i++) {
-            var char = to_chars[i];
+            var ch = to_chars[i];
             if (last_from == null) {
-              last_from = char;
-              to_chars_expanded.push(char);
+              last_from = ch;
+              to_chars_expanded.push(ch);
             }
-            else if (char === '-') {
+            else if (ch === '-') {
               if (last_to === '-') {
                 to_chars_expanded.push('-');
                 to_chars_expanded.push('-');
@@ -830,16 +933,16 @@ class String
             }
             else if (in_range) {
               var start = last_from.charCodeAt(0) + 1;
-              var end = char.charCodeAt(0);
+              var end = ch.charCodeAt(0);
               for (var c = start; c < end; c++) {
                 to_chars_expanded.push(String.fromCharCode(c));
               }
-              to_chars_expanded.push(char);
+              to_chars_expanded.push(ch);
               in_range = null;
               last_from = null;
             }
             else {
-              to_chars_expanded.push(char);
+              to_chars_expanded.push(ch);
             }
           }
 
@@ -861,14 +964,14 @@ class String
       }
 
       var new_str = ''
-      for (var i = 0, length = #{self}.length; i < length; i++) {
-        var char = #{self}.charAt(i);
-        var sub = subs[char];
+      for (var i = 0, length = self.length; i < length; i++) {
+        var ch = self.charAt(i);
+        var sub = subs[ch];
         if (inverse) {
-          new_str += (sub == null ? global_sub : char);
+          new_str += (sub == null ? global_sub : ch);
         }
         else {
-          new_str += (sub != null ? sub : char);
+          new_str += (sub != null ? sub : ch);
         }
       }
       return new_str;
@@ -878,7 +981,7 @@ class String
   def tr_s(from, to)
     %x{
       if (from.length == 0) {
-        return #{self};
+        return self;
       }
 
       var subs = {};
@@ -900,12 +1003,12 @@ class String
       var last_from = null;
       var in_range = false;
       for (var i = 0; i < from_length; i++) {
-        var char = from_chars[i];
+        var ch = from_chars[i];
         if (last_from == null) {
-          last_from = char;
-          from_chars_expanded.push(char);
+          last_from = ch;
+          from_chars_expanded.push(ch);
         }
-        else if (char === '-') {
+        else if (ch === '-') {
           if (last_from === '-') {
             from_chars_expanded.push('-');
             from_chars_expanded.push('-');
@@ -919,16 +1022,16 @@ class String
         }
         else if (in_range) {
           var start = last_from.charCodeAt(0) + 1;
-          var end = char.charCodeAt(0);
+          var end = ch.charCodeAt(0);
           for (var c = start; c < end; c++) {
             from_chars_expanded.push(String.fromCharCode(c));
           }
-          from_chars_expanded.push(char);
+          from_chars_expanded.push(ch);
           in_range = null;
           last_from = null;
         }
         else {
-          from_chars_expanded.push(char);
+          from_chars_expanded.push(ch);
         }
       }
 
@@ -946,12 +1049,12 @@ class String
           var last_to = null;
           var in_range = false;
           for (var i = 0; i < to_length; i++) {
-            var char = to_chars[i];
+            var ch = to_chars[i];
             if (last_from == null) {
-              last_from = char;
-              to_chars_expanded.push(char);
+              last_from = ch;
+              to_chars_expanded.push(ch);
             }
-            else if (char === '-') {
+            else if (ch === '-') {
               if (last_to === '-') {
                 to_chars_expanded.push('-');
                 to_chars_expanded.push('-');
@@ -965,16 +1068,16 @@ class String
             }
             else if (in_range) {
               var start = last_from.charCodeAt(0) + 1;
-              var end = char.charCodeAt(0);
+              var end = ch.charCodeAt(0);
               for (var c = start; c < end; c++) {
                 to_chars_expanded.push(String.fromCharCode(c));
               }
-              to_chars_expanded.push(char);
+              to_chars_expanded.push(ch);
               in_range = null;
               last_from = null;
             }
             else {
-              to_chars_expanded.push(char);
+              to_chars_expanded.push(ch);
             }
           }
 
@@ -996,9 +1099,9 @@ class String
       }
       var new_str = ''
       var last_substitute = null
-      for (var i = 0, length = #{self}.length; i < length; i++) {
-        var char = #{self}.charAt(i);
-        var sub = subs[char]
+      for (var i = 0, length = self.length; i < length; i++) {
+        var ch = self.charAt(i);
+        var sub = subs[ch]
         if (inverse) {
           if (sub == null) {
             if (last_substitute == null) {
@@ -1007,7 +1110,7 @@ class String
             }
           }
           else {
-            new_str += char;
+            new_str += ch;
             last_substitute = null;
           }
         }
@@ -1019,7 +1122,7 @@ class String
             }
           }
           else {
-            new_str += char;
+            new_str += ch;
             last_substitute = null;
           }
         }