opal 0.6.3 → 0.7.0.beta1

data/opal/corelib/string.rb

@@ -3,7 +3,7 @@ require 'corelib/comparable'
 class String
   include Comparable
 
-  `def._isString = true`
+  `def.$$is_string = true`
 
   def self.try_convert(what)
     what.to_str
@@ -81,7 +81,7 @@ class String
 
   def =~(other)
     %x{
-      if (other._isString) {
+      if (other.$$is_string) {
         #{raise TypeError, 'type mismatch: String given'};
       }
 
@@ -93,7 +93,7 @@ class String
     %x{
       var size = self.length;
 
-      if (index._isRange) {
+      if (index.$$is_range) {
         var exclude = index.exclude,
             length  = index.end,
             index   = index.begin;
@@ -313,7 +313,7 @@ class String
           options = pattern.substr(pattern.lastIndexOf('/') + 1) + 'g',
           regexp  = pattern.substr(1, pattern.lastIndexOf('/') - 1);
 
-      self.$sub._p = block;
+      self.$sub.$$p = block;
       return self.$sub(new RegExp(regexp, options), replace);
     }
   end
@@ -328,7 +328,7 @@ class String
 
   def include?(other)
     %x{
-      if (other._isString) {
+      if (other.$$is_string) {
         return self.indexOf(other) !== -1;
       }
     }
@@ -616,7 +616,7 @@ class String
         return [self];
       }
 
-      if (pattern && pattern._isRegexp) {
+      if (pattern && pattern.$$is_regexp) {
         var pattern_str = pattern.toString();
 
         /* Opal and JS's repr of an empty RE. */
@@ -762,14 +762,44 @@ class String
     `self.replace(/^\s*/, '').replace(/\s*$/, '')`
   end
 
+  %x{
+    // convert Ruby back reference to JavaScript back reference
+    function convertReplace(replace) {
+      return replace.replace(
+        /(^|[^\\])\\\\(\d)/g, '$1\\$2'
+      ).replace(
+        /(^|[^\\])(\\\\)+\\\\(\d)/g, '$1$2\\$3'
+      ).replace(
+        /(^|[^\\])(?:(\\)\\)+([^\\]|$)/g, '$1$2$3'
+      );
+    }
+  }
+
   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);
+      if (typeof(pattern) !== 'string' && !pattern.$$is_regexp) {
+        pattern = #{Opal.coerce_to! pattern, String, :to_str};
+      }
+
+      if (replace !== undefined) {
+        if (#{replace.is_a?(Hash)}) {
+          return self.replace(pattern, function(str) {
+            var value = #{replace[str]};
+
+            return (value == null) ? nil : #{value.to_s};
+          });
+        }
+        else {
+          if (typeof(replace) !== 'string') {
+            replace = #{Opal.coerce_to! replace, String, :to_str};
+          }
+
+          replace = convertReplace(replace);
+          return self.replace(pattern, replace);
+        }
+
       }
-      if (block !== nil) {
+      else if (block != null && block !== nil) {
         return self.replace(pattern, function() {
           // FIXME: this should be a formal MatchData object with all the goodies
           var match_data = []
@@ -788,36 +818,16 @@ class String
           var match_len = match_data.length;
 
           // $1, $2, $3 not being parsed correctly in Ruby code
-          //for (var i = 1; i < match_len; i++) {
-          //  __gvars[String(i)] = match_data[i];
-          //}
+          for (var i = 1; i < match_len; i++) {
+            Opal.gvars[String(i)] = match_data[i];
+          }
           #{$& = `match_data[0]`};
           #{$~ = `match_data`};
           return block(match_data[0]);
         });
       }
-      else if (replace !== undefined) {
-        if (#{replace.is_a?(Hash)}) {
-          return self.replace(pattern, function(str) {
-            var value = #{replace[str]};
-
-            return (value == null) ? nil : #{value.to_s};
-          });
-        }
-        else {
-          replace = #{String.try_convert(replace)};
-
-          if (replace == null) {
-            #{raise TypeError, "can't convert #{replace.class} into String"};
-          }
-
-          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);
+        #{raise ArgumentError, 'wrong number of arguments (1 for 2)'}
       }
     }
   end
@@ -880,8 +890,13 @@ class String
   end
 
   def to_proc
-    proc do |recv, *args|
-      recv.send(self, *args)
+    # Give name to self in case this proc is passed to instance_eval
+    sym = self
+
+    proc do |*args, &block|
+      raise ArgumentError, "no receiver given" if args.empty?
+      obj = args.shift
+      obj.send(sym, *args, &block)
     end
   end
 

data/opal/corelib/string/inheritance.rb

@@ -3,10 +3,10 @@ class String
     replace = Class.new(String::Wrapper)
 
     %x{
-      klass._proto        = replace._proto;
-      klass._proto._klass = klass;
-      klass._alloc        = replace._alloc;
-      klass.__parent      = #{String::Wrapper};
+      klass.$$proto        = replace.$$proto;
+      klass.$$proto.$$class = klass;
+      klass.$$alloc        = replace.$$alloc;
+      klass.$$parent      = #{String::Wrapper};
 
       klass.$allocate = replace.$allocate;
       klass.$new      = replace.$new;
@@ -38,7 +38,7 @@ class String::Wrapper
   def method_missing(*args, &block)
     result = @literal.__send__(*args, &block)
 
-    if `result._isString != null`
+    if `result.$$is_string != null`
       if `result == #@literal`
         self
       else

data/opal/corelib/time.rb

@@ -124,24 +124,26 @@ class Time
     other = Opal.coerce_to other, Integer, :to_int
 
     %x{
-      var result = new Date(self.getTime() + (other * 1000));
-      result.tz_offset = self.tz_offset;
+      var result           = new Date(self.getTime() + (other * 1000));
+          result.tz_offset = #@tz_offset;
+
       return result;
     }
   end
 
   def -(other)
     if Time === other
-      `(self.getTime() - other.getTime()) / 1000`
-    else
-      other = Opal.coerce_to other, Integer, :to_int
-
-      %x{
-        var result = new Date(self.getTime() - (other * 1000));
-        result.tz_offset = self.tz_offset;
-        return result;
-      }
+      return `(self.getTime() - other.getTime()) / 1000`
     end
+
+    other = Opal.coerce_to other, Integer, :to_int
+
+    %x{
+      var result           = new Date(self.getTime() - (other * 1000));
+          result.tz_offset = #@tz_offset;
+
+      return result;
+    }
   end
 
   def <=>(other)
@@ -159,7 +161,14 @@ class Time
   alias ctime asctime
 
   def day
-    `self.getDate()`
+    %x{
+      if (#@tz_offset === 0) {
+        return self.getUTCDate();
+      }
+      else {
+        return self.getDate();
+      }
+    }
   end
 
   def yday
@@ -179,11 +188,18 @@ class Time
   end
 
   def friday?
-    `self.getDay() === 5`
+    `#{wday} == 5`
   end
 
   def hour
-    `self.getHours()`
+    %x{
+      if (#@tz_offset === 0) {
+        return self.getUTCHours();
+      }
+      else {
+        return self.getHours();
+      }
+    }
   end
 
   def inspect
@@ -197,25 +213,46 @@ class Time
   alias mday day
 
   def min
-    `self.getMinutes()`
+    %x{
+      if (#@tz_offset === 0) {
+        return self.getUTCMinutes();
+      }
+      else {
+        return self.getMinutes();
+      }
+    }
   end
 
   def mon
-    `self.getMonth() + 1`
+    %x{
+      if (#@tz_offset === 0) {
+        return self.getUTCMonth() + 1;
+      }
+      else {
+        return self.getMonth() + 1;
+      }
+    }
   end
 
   def monday?
-    `self.getDay() === 1`
+    `#{wday} == 1`
   end
 
   alias month mon
 
   def saturday?
-    `self.getDay() === 6`
+    `#{wday} == 6`
   end
 
   def sec
-    `self.getSeconds()`
+    %x{
+      if (#@tz_offset === 0) {
+        return self.getUTCSeconds();
+      }
+      else {
+        return self.getSeconds();
+      }
+    }
   end
 
   def usec
@@ -246,14 +283,15 @@ class Time
 
   def getgm
     %x{
-      var result = new Date(self.getTime());
-      result.tz_offset = 0;
+      var result           = new Date(self.getTime());
+          result.tz_offset = 0;
+
       return result;
     }
   end
 
   def gmt?
-    `self.tz_offset == 0`
+    `#@tz_offset === 0`
   end
 
   def gmt_offset
@@ -283,42 +321,42 @@ class Time
 
         switch (conv) {
           case 'Y':
-            result += self.getFullYear();
+            result += #{year};
             break;
 
           case 'C':
             zero    = !blank;
-            result += Match.round(self.getFullYear() / 100);
+            result += Match.round(#{year} / 100);
             break;
 
           case 'y':
             zero    = !blank;
-            result += (self.getFullYear() % 100);
+            result += (#{year} % 100);
             break;
 
           case 'm':
             zero    = !blank;
-            result += (self.getMonth() + 1);
+            result += #{mon};
             break;
 
           case 'B':
-            result += long_months[self.getMonth()];
+            result += long_months[#{mon} - 1];
             break;
 
           case 'b':
           case 'h':
             blank   = !zero;
-            result += short_months[self.getMonth()];
+            result += short_months[#{mon} - 1];
             break;
 
           case 'd':
             zero    = !blank
-            result += self.getDate();
+            result += #{day};
             break;
 
           case 'e':
             blank   = !zero
-            result += self.getDate();
+            result += #{day};
             break;
 
           case 'j':
@@ -327,40 +365,40 @@ class Time
 
           case 'H':
             zero    = !blank;
-            result += self.getHours();
+            result += #{hour};
             break;
 
           case 'k':
             blank   = !zero;
-            result += self.getHours();
+            result += #{hour};
             break;
 
           case 'I':
             zero    = !blank;
-            result += (self.getHours() % 12 || 12);
+            result += (#{hour} % 12 || 12);
             break;
 
           case 'l':
             blank   = !zero;
-            result += (self.getHours() % 12 || 12);
+            result += (#{hour} % 12 || 12);
             break;
 
           case 'P':
-            result += (self.getHours() >= 12 ? "pm" : "am");
+            result += (#{hour} >= 12 ? "pm" : "am");
             break;
 
           case 'p':
-            result += (self.getHours() >= 12 ? "PM" : "AM");
+            result += (#{hour} >= 12 ? "PM" : "AM");
             break;
 
           case 'M':
             zero    = !blank;
-            result += self.getMinutes();
+            result += #{min};
             break;
 
           case 'S':
             zero    = !blank;
-            result += self.getSeconds();
+            result += #{sec}
             break;
 
           case 'L':
@@ -402,26 +440,26 @@ class Time
             break;
 
           case 'A':
-            result += days_of_week[self.getDay()];
+            result += days_of_week[#{wday}];
             break;
 
           case 'a':
-            result += short_days[self.getDay()];
+            result += short_days[#{wday}];
             break;
 
           case 'u':
-            result += (self.getDay() + 1);
+            result += (#{wday} + 1);
             break;
 
           case 'w':
-            result += self.getDay();
+            result += #{wday};
             break;
 
           // TODO: week year
           // TODO: week number
 
           case 's':
-            result += parseInt(self.getTime() / 1000)
+            result += #{to_i};
             break;
 
           case 'n':
@@ -489,11 +527,11 @@ class Time
   end
 
   def sunday?
-    `self.getDay() === 0`
+    `#{wday} == 0`
   end
 
   def thursday?
-    `self.getDay() === 4`
+    `#{wday} == 4`
   end
 
   def to_a
@@ -511,24 +549,36 @@ class Time
   alias to_s inspect
 
   def tuesday?
-    `self.getDay() === 2`
+    `#{wday} == 2`
   end
 
   alias utc? gmt?
 
-  def utc_offset
-    `self.getTimezoneOffset() * -60`
-  end
+  alias utc_offset gmt_offset
 
   def wday
-    `self.getDay()`
+    %x{
+      if (#@tz_offset === 0) {
+        return self.getUTCDay();
+      }
+      else {
+        return self.getDay();
+      }
+    }
   end
 
   def wednesday?
-    `self.getDay() === 3`
+    `#{wday} == 3`
   end
 
   def year
-    `self.getFullYear()`
+    %x{
+      if (#@tz_offset === 0) {
+        return self.getUTCFullYear();
+      }
+      else {
+        return self.getFullYear();
+      }
+    }
   end
 end