opal 0.8.1 → 0.9.0.beta1

data/opal/corelib/string.rb

@@ -1,6 +1,7 @@
 require 'corelib/comparable'
+require 'corelib/regexp'
 
-class String
+class String < `String`
   include Comparable
 
   `def.$$is_string = true`
@@ -8,6 +9,7 @@ class String
   def __id__
     `self.toString()`
   end
+
   alias object_id __id__
 
   def self.try_convert(what)
@@ -99,10 +101,6 @@ class String
     end
   end
 
-  def <<(other)
-    raise NotImplementedError, '#<< not supported. Mutable String methods are not supported in Opal.'
-  end
-
   def ==(other)
     %x{
       if (other.$$is_string) {
@@ -130,12 +128,12 @@ class String
 
   def [](index, length = undefined)
     %x{
-      var size = self.length;
+      var size = self.length, exclude;
 
       if (index.$$is_range) {
-        var exclude = index.exclude,
-            length  = #{Opal.coerce_to(`index.end`, Integer, :to_int)},
-            index   = #{Opal.coerce_to(`index.begin`, Integer, :to_int)};
+        exclude = index.exclude;
+        length  = #{Opal.coerce_to(`index.end`, Integer, :to_int)};
+        index   = #{Opal.coerce_to(`index.begin`, Integer, :to_int)};
 
         if (Math.abs(index) > size) {
           return nil;
@@ -226,12 +224,12 @@ class String
     }
   end
 
+  alias byteslice []
+
   def capitalize
     `self.charAt(0).toUpperCase() + self.substr(1).toLowerCase()`
   end
 
-  alias capitalize! <<
-
   def casecmp(other)
     other = Opal.coerce_to(other, String, :to_str).to_s
     %x{
@@ -292,8 +290,6 @@ class String
     self
   end
 
-  alias chomp! <<
-
   def chop
     %x{
       var length = self.length;
@@ -311,14 +307,13 @@ class String
     }
   end
 
-  alias chop! <<
-
   def chr
     `self.charAt(0)`
   end
 
   def clone
     copy = `self.slice()`
+    copy.copy_singleton_methods(self)
     copy.initialize_clone(self)
     copy
   end
@@ -355,56 +350,79 @@ class String
     }
   end
 
-  alias dup clone
-
   def downcase
     `self.toLowerCase()`
   end
 
-  alias downcase! <<
-
   def each_char(&block)
-    return enum_for :each_char unless block_given?
+    return enum_for(:each_char){self.size} unless block_given?
 
     %x{
       for (var i = 0, length = self.length; i < length; i++) {
-        #{yield `self.charAt(i)`};
+        var value = Opal.yield1(block, self.charAt(i));
+
+        if (value === $breaker) {
+          return $breaker.$v;
+        }
       }
     }
 
     self
   end
 
-  def each_line(separator = $/)
+  def each_line(separator = $/, &block)
     return enum_for :each_line, separator unless block_given?
 
     %x{
+      var value;
+
       if (separator === nil) {
-        #{yield self};
-        return self;
+        value = Opal.yield1(block, self);
+
+        if (value === $breaker) {
+          return value.$v;
+        }
+        else {
+          return self;
+        }
       }
 
       separator = #{Opal.coerce_to(`separator`, String, :to_str)}
 
+      var a, i, n, length, chomped, trailing, splitted;
+
       if (separator.length === 0) {
-        for (var a = self.split(/(\n{2,})/), i = 0, n = a.length; i < n; i += 2) {
+        for (a = self.split(/(\n{2,})/), i = 0, n = a.length; i < n; i += 2) {
           if (a[i] || a[i + 1]) {
-            #{yield `(a[i] || "") + (a[i + 1] || "")`};
+            value = Opal.yield1(block, (a[i] || "") + (a[i + 1] || ""));
+
+            if (value === $breaker) {
+              return value.$v;
+            }
           }
         }
+
         return self;
       }
 
-      var chomped  = #{chomp(separator)},
-          trailing = self.length != chomped.length,
-          splitted = chomped.split(separator);
+      chomped  = #{chomp(separator)};
+      trailing = self.length != chomped.length;
+      splitted = chomped.split(separator);
 
-      for (var i = 0, length = splitted.length; i < length; i++) {
+      for (i = 0, length = splitted.length; i < length; i++) {
         if (i < length - 1 || trailing) {
-          #{yield `splitted[i] + separator`};
+          value = Opal.yield1(block, splitted[i] + separator);
+
+          if (value === $breaker) {
+            return value.$v;
+          }
         }
         else {
-          #{yield `splitted[i]`};
+          value = Opal.yield1(block, splitted[i]);
+
+          if (value === $breaker) {
+            return value.$v;
+          }
         }
       }
     }
@@ -436,6 +454,10 @@ class String
 
   def gsub(pattern, replacement = undefined, &block)
     %x{
+      if (replacement === undefined && block === nil) {
+        #{return enum_for :gsub, pattern}
+      }
+
       var result = '', match_data = nil, index = 0, match, _replacement;
 
       if (pattern.$$is_regexp) {
@@ -457,9 +479,6 @@ class String
         match_data = #{MatchData.new `pattern`, `match`};
 
         if (replacement === undefined) {
-          if (block === nil) {
-            #{raise ArgumentError, 'wrong number of arguments (1 for 2)'}
-          }
           _replacement = block(match[0]);
         }
         else if (replacement.$$is_hash) {
@@ -504,8 +523,6 @@ class String
     }
   end
 
-  alias gsub! <<
-
   def hash
     `self.toString()`
   end
@@ -638,8 +655,6 @@ class String
     `self.replace(/^\s*/, '')`
   end
 
-  alias lstrip! <<
-
   def match(pattern, pos = undefined, &block)
     if String === pattern || pattern.respond_to?(:to_str)
       pattern = Regexp.new(pattern.to_str)
@@ -722,8 +737,6 @@ class String
     }
   end
 
-  alias next! <<
-
   def oct
     %x{
       var result,
@@ -805,8 +818,6 @@ class String
     `self.split('').reverse().join('')`
   end
 
-  alias reverse! <<
-
   def rindex(search, offset = undefined)
     %x{
       var i, m, r, _m;
@@ -950,7 +961,6 @@ class String
   alias size length
 
   alias slice []
-  alias slice! <<
 
   def split(pattern = undefined, limit = undefined)
     %x{
@@ -1050,8 +1060,6 @@ class String
     }
   end
 
-  alias squeeze! <<
-
   def start_with?(*prefixes)
     %x{
       for (var i = 0, length = prefixes.length; i < length; i++) {
@@ -1070,8 +1078,6 @@ class String
     `self.replace(/^\s*/, '').replace(/[\s\u0000]*$/, '')`
   end
 
-  alias strip! <<
-
   def sub(pattern, replacement = undefined, &block)
     %x{
       if (!pattern.$$is_regexp) {
@@ -1124,10 +1130,7 @@ class String
     }
   end
 
-  alias sub! <<
-
   alias succ next
-  alias succ! <<
 
   def sum(n = 16)
     %x{
@@ -1163,8 +1166,6 @@ class String
     }
   end
 
-  alias swapcase! <<
-
   def to_f
     %x{
       if (self.charAt(0) === '_') {
@@ -1268,6 +1269,7 @@ class String
         return self;
       }
 
+      var i, in_range, c, ch, start, end, length;
       var subs = {};
       var from_chars = from.split('');
       var from_length = from_chars.length;
@@ -1285,9 +1287,9 @@ class String
 
       var from_chars_expanded = [];
       var last_from = null;
-      var in_range = false;
-      for (var i = 0; i < from_length; i++) {
-        var ch = from_chars[i];
+      in_range = false;
+      for (i = 0; i < from_length; i++) {
+        ch = from_chars[i];
         if (last_from == null) {
           last_from = ch;
           from_chars_expanded.push(ch);
@@ -1305,12 +1307,12 @@ class String
           }
         }
         else if (in_range) {
-          var start = last_from.charCodeAt(0);
-          var end = ch.charCodeAt(0);
+          start = last_from.charCodeAt(0);
+          end = ch.charCodeAt(0);
           if (start > end) {
             #{raise ArgumentError, "invalid range \"#{`String.fromCharCode(start)`}-#{`String.fromCharCode(end)`}\" in string transliteration"}
           }
-          for (var c = start + 1; c < end; c++) {
+          for (c = start + 1; c < end; c++) {
             from_chars_expanded.push(String.fromCharCode(c));
           }
           from_chars_expanded.push(ch);
@@ -1326,7 +1328,7 @@ class String
       from_length = from_chars.length;
 
       if (inverse) {
-        for (var i = 0; i < from_length; i++) {
+        for (i = 0; i < from_length; i++) {
           subs[from_chars[i]] = true;
         }
       }
@@ -1334,9 +1336,9 @@ class String
         if (to_length > 0) {
           var to_chars_expanded = [];
           var last_to = null;
-          var in_range = false;
-          for (var i = 0; i < to_length; i++) {
-            var ch = to_chars[i];
+          in_range = false;
+          for (i = 0; i < to_length; i++) {
+            ch = to_chars[i];
             if (last_from == null) {
               last_from = ch;
               to_chars_expanded.push(ch);
@@ -1354,12 +1356,12 @@ class String
               }
             }
             else if (in_range) {
-              var start = last_from.charCodeAt(0);
-              var end = ch.charCodeAt(0);
+              start = last_from.charCodeAt(0);
+              end = ch.charCodeAt(0);
               if (start > end) {
                 #{raise ArgumentError, "invalid range \"#{`String.fromCharCode(start)`}-#{`String.fromCharCode(end)`}\" in string transliteration"}
               }
-              for (var c = start + 1; c < end; c++) {
+              for (c = start + 1; c < end; c++) {
                 to_chars_expanded.push(String.fromCharCode(c));
               }
               to_chars_expanded.push(ch);
@@ -1378,19 +1380,19 @@ class String
         var length_diff = from_length - to_length;
         if (length_diff > 0) {
           var pad_char = (to_length > 0 ? to_chars[to_length - 1] : '');
-          for (var i = 0; i < length_diff; i++) {
+          for (i = 0; i < length_diff; i++) {
             to_chars.push(pad_char);
           }
         }
 
-        for (var i = 0; i < from_length; i++) {
+        for (i = 0; i < from_length; i++) {
           subs[from_chars[i]] = to_chars[i];
         }
       }
 
       var new_str = ''
-      for (var i = 0, length = self.length; i < length; i++) {
-        var ch = self.charAt(i);
+      for (i = 0, length = self.length; i < length; i++) {
+        ch = self.charAt(i);
         var sub = subs[ch];
         if (inverse) {
           new_str += (sub == null ? global_sub : ch);
@@ -1403,8 +1405,6 @@ class String
     }
   end
 
-  alias tr! <<
-
   def tr_s(from, to)
     from = Opal.coerce_to(from, String, :to_str).to_s
     to = Opal.coerce_to(to, String, :to_str).to_s
@@ -1413,6 +1413,7 @@ class String
         return self;
       }
 
+      var i, in_range, c, ch, start, end, length;
       var subs = {};
       var from_chars = from.split('');
       var from_length = from_chars.length;
@@ -1430,9 +1431,9 @@ class String
 
       var from_chars_expanded = [];
       var last_from = null;
-      var in_range = false;
-      for (var i = 0; i < from_length; i++) {
-        var ch = from_chars[i];
+      in_range = false;
+      for (i = 0; i < from_length; i++) {
+        ch = from_chars[i];
         if (last_from == null) {
           last_from = ch;
           from_chars_expanded.push(ch);
@@ -1450,12 +1451,12 @@ class String
           }
         }
         else if (in_range) {
-          var start = last_from.charCodeAt(0);
-          var end = ch.charCodeAt(0);
+          start = last_from.charCodeAt(0);
+          end = ch.charCodeAt(0);
           if (start > end) {
             #{raise ArgumentError, "invalid range \"#{`String.fromCharCode(start)`}-#{`String.fromCharCode(end)`}\" in string transliteration"}
           }
-          for (var c = start + 1; c < end; c++) {
+          for (c = start + 1; c < end; c++) {
             from_chars_expanded.push(String.fromCharCode(c));
           }
           from_chars_expanded.push(ch);
@@ -1471,7 +1472,7 @@ class String
       from_length = from_chars.length;
 
       if (inverse) {
-        for (var i = 0; i < from_length; i++) {
+        for (i = 0; i < from_length; i++) {
           subs[from_chars[i]] = true;
         }
       }
@@ -1479,9 +1480,9 @@ class String
         if (to_length > 0) {
           var to_chars_expanded = [];
           var last_to = null;
-          var in_range = false;
-          for (var i = 0; i < to_length; i++) {
-            var ch = to_chars[i];
+          in_range = false;
+          for (i = 0; i < to_length; i++) {
+            ch = to_chars[i];
             if (last_from == null) {
               last_from = ch;
               to_chars_expanded.push(ch);
@@ -1499,12 +1500,12 @@ class String
               }
             }
             else if (in_range) {
-              var start = last_from.charCodeAt(0);
-              var end = ch.charCodeAt(0);
+              start = last_from.charCodeAt(0);
+              end = ch.charCodeAt(0);
               if (start > end) {
                 #{raise ArgumentError, "invalid range \"#{`String.fromCharCode(start)`}-#{`String.fromCharCode(end)`}\" in string transliteration"}
               }
-              for (var c = start + 1; c < end; c++) {
+              for (c = start + 1; c < end; c++) {
                 to_chars_expanded.push(String.fromCharCode(c));
               }
               to_chars_expanded.push(ch);
@@ -1523,19 +1524,19 @@ class String
         var length_diff = from_length - to_length;
         if (length_diff > 0) {
           var pad_char = (to_length > 0 ? to_chars[to_length - 1] : '');
-          for (var i = 0; i < length_diff; i++) {
+          for (i = 0; i < length_diff; i++) {
             to_chars.push(pad_char);
           }
         }
 
-        for (var i = 0; i < from_length; i++) {
+        for (i = 0; i < from_length; i++) {
           subs[from_chars[i]] = to_chars[i];
         }
       }
       var new_str = ''
       var last_substitute = null
-      for (var i = 0, length = self.length; i < length; i++) {
-        var ch = self.charAt(i);
+      for (i = 0, length = self.length; i < length; i++) {
+        ch = self.charAt(i);
         var sub = subs[ch]
         if (inverse) {
           if (sub == null) {
@@ -1566,22 +1567,10 @@ class String
     }
   end
 
-  alias tr_s! <<
-
   def upcase
     `self.toUpperCase()`
   end
 
-  alias upcase! <<
-
-  def freeze
-    self
-  end
-
-  def frozen?
-    true
-  end
-
   def upto(stop, excl = false, &block)
     return enum_for :upto, stop, excl unless block_given?
     stop = Opal.coerce_to(stop, String, :to_str)
@@ -1601,10 +1590,10 @@ class String
           a += 1;
         }
 
-      } else if (parseInt(s).toString() === s && parseInt(stop).toString() === stop) {
+      } else if (parseInt(s, 10).toString() === s && parseInt(stop, 10).toString() === stop) {
 
-        a = parseInt(s);
-        b = parseInt(stop);
+        a = parseInt(s, 10);
+        b = parseInt(stop, 10);
 
         while (a <= b) {
           if (excl && a === b) {