opal 0.3.20 → 0.3.21

data/core/basic_object.rb

@@ -3,14 +3,18 @@ class BasicObject
   end
 
   def ==(other)
-    `this === other`
+    `#{self} === other`
   end
 
   def __send__(symbol, *args, &block)
     %x{
-      var meth = this[mid_to_jsid(symbol)];
+      var meth = #{self}.$m[symbol];
 
-      return meth.apply(this, args);
+      if (!meth) {
+        return #{ method_missing symbol };
+      }
+
+      return meth.apply(null, [#{self}].concat(args));
     }
   end
 
@@ -25,7 +29,7 @@ class BasicObject
         no_block_given();
       }
 
-      return block.call(this, this);
+      return block(#{self});
     }
   end
 

data/core/boolean.rb

@@ -4,29 +4,29 @@ class Boolean < `Boolean`
   }
 
   def &(other)
-    `(this == true) ? (other !== false && other !== nil) : false`
+    `(#{self} == true) ? (other !== false && other !== nil) : false`
   end
 
   def |(other)
-    `(this == true) ? true : (other !== false && other !== nil)`
+    `(#{self} == true) ? true : (other !== false && other !== nil)`
   end
 
   def ^(other)
-    `(this == true) ? (other === false || other === nil) : (other !== false && other !== nil)`
+    `(#{self} == true) ? (other === false || other === nil) : (other !== false && other !== nil)`
   end
 
   def ==(other)
-    `(this == true) === other.valueOf()`
+    `(#{self} == true) === other.valueOf()`
   end
 
   alias singleton_class class
 
   def to_json
-    `this.valueOf() ? 'true' : 'false'`
+    `#{self}.valueOf() ? 'true' : 'false'`
   end
 
   def to_s
-    `(this == true) ? 'true' : 'false'`
+    `(#{self} == true) ? 'true' : 'false'`
   end
 end
 

data/core/class.rb

@@ -5,10 +5,10 @@ class Class
       var klass   = boot_class(sup, AnonClass)
       klass._name = nil;
 
-      sup.$inherited(klass);
+      #{ sup.inherited `klass` };
 
       if (block !== nil) {
-        block.call(klass);
+        block(klass, '');
       }
 
       return klass;
@@ -17,7 +17,7 @@ class Class
 
   def allocate
     %x{
-      var obj = new this;
+      var obj = [];
       obj._id = unique_id++;
       return obj;
     }
@@ -25,9 +25,11 @@ class Class
 
   def new(*args, &block)
     %x{
-      var obj = this.$allocate();
-      obj._p  = block;
-      obj.$initialize.apply(obj, args);
+      var obj = new self;
+      obj._id = unique_id++;
+      obj.$m.initialize._p  = block;
+
+      obj.$m.initialize.apply(null, [obj].concat(args));
       return obj;
     }
   end
@@ -37,15 +39,7 @@ class Class
 
   def superclass
     %x{
-      var sup = this._super;
-
-      if (!sup) {
-        return nil;
-      }
-
-      while (sup && (sup._isIClass)) {
-        sup = sup._super;
-      }
+      var sup = #{self}.$s;
 
       if (!sup) {
         return nil;

data/core/dir.rb

@@ -0,0 +1,89 @@
+class Dir
+  def self.getwd
+    ""
+  end
+
+  def self.pwd
+    ""
+  end
+
+  def self.[](*globs)
+    %x{
+      var result = [], files = factories;
+
+      for (var i = 0, ii = globs.length; i < ii; i++) {
+        var glob = globs[i];
+
+        var re = fs_glob_to_regexp(#{ File.expand_path `glob` });
+
+        for (var file in files) {
+          if (re.exec(file)) {
+            result.push(file);
+          }
+        }
+      }
+
+      return result;
+    }
+  end
+
+  %x(
+    function fs_glob_to_regexp(glob) {
+      var parts  = glob.split(''),
+          length = parts.length,
+          result = '';
+
+      var opt_group_stack = 0;
+
+      for (var i = 0; i < length; i++) {
+        var cur = parts[i];
+
+        switch (cur) {
+          case '*':
+            if (parts[i + 1] === '*' && parts[i + 2] === '/') {
+              result += '.*';
+              i += 2;
+            }
+            else {
+              result += '[^/]*';
+            }
+            break;
+
+          case '.':
+            result += '\\\\';
+            result += cur;
+            break;
+
+          case ',':
+            if (opt_group_stack) {
+              result += '|';
+            }
+            else {
+              result += ',';
+            }
+            break;
+
+          case '{':
+            result += '(';
+            opt_group_stack++;
+            break;
+
+          case '}':
+            if (opt_group_stack) {
+              result += ')';
+              opt_group_stack--;
+            }
+            else {
+              result += '}'
+            }
+            break;
+
+          default:
+            result += cur;
+        }
+      }
+
+      return new RegExp('^' + result + '$');
+    }
+  )
+end

data/core/enumerable.rb

@@ -1,13 +1,13 @@
 module Enumerable
   def all?(&block)
     %x{
-      var result = true, proc;
+      var result = true, proc, each = #{self}.$m.each;
 
       if (block !== nil) {
-        proc = function(obj) {
+        proc = function(s, obj) {
           var value;
 
-          if ((value = block.call(__context, obj)) === __breaker) {
+          if ((value = block(__context, obj)) === __breaker) {
             return __breaker.$v;
           }
 
@@ -20,7 +20,7 @@ module Enumerable
         }
       }
       else {
-        proc = function(obj) {
+        proc = function(s, obj) {
           if (obj === false || obj === nil) {
             result = false;
             __breaker.$v = nil;
@@ -30,8 +30,8 @@ module Enumerable
         }
       }
 
-      this.$each._p = proc;
-      this.$each();
+      each._p = proc;
+      each(#{self});
 
       return result;
     }
@@ -39,13 +39,13 @@ module Enumerable
 
   def any?(&block)
     %x{
-      var result = false, proc;
+      var result = false, proc, each = #{self}.$m.each;
 
       if (block !== nil) {
-        proc = function(obj) {
+        proc = function(s, obj) {
           var value;
 
-          if ((value = block.call(__context, obj)) === __breaker) {
+          if ((value = block(__context, obj)) === __breaker) {
             return __breaker.$v;
           }
 
@@ -58,7 +58,7 @@ module Enumerable
         }
       }
       else {
-        proc = function(obj) {
+        proc = function(s, obj) {
           if (obj !== false && obj !== nil) {
             result      = true;
             __breaker.$v = nil;
@@ -68,8 +68,8 @@ module Enumerable
         }
       }
 
-      this.$each._p = proc;
-      this.$each();
+      each._p = proc;
+      each(#{self});
 
       return result;
     }
@@ -79,20 +79,20 @@ module Enumerable
     return enum_for :collect unless block_given?
 
     %x{
-      var result = [];
+      var result = [], each = #{self}.$m.each;
 
       var proc = function() {
-        var obj = __slice.call(arguments), value;
+        var obj = __slice.call(arguments, 1), value;
 
-        if ((value = block.apply(__context, obj)) === __breaker) {
+        if ((value = block.apply(null, [__context].concat(obj))) === __breaker) {
           return __breaker.$v;
         }
 
         result.push(value);
       };
 
-      this.$each._p = proc;
-      this.$each();
+      each._p = proc;
+      each(#{self});
 
       return result;
     }
@@ -100,21 +100,19 @@ module Enumerable
 
   def count(object, &block)
     %x{
-      var result = 0;
+      var result = 0, each = #{self}.$m.each;
 
-      if (block === nil) {
-        if (object == null) {
-          block = function() { return true; };
-        }
-        else {
-          block = function(obj) { return #{`obj` == `object`}; };
-        }
+      if (object != null) {
+        block = function(s, obj) { return #{ `obj` == `object` }; };
+      }
+      else if (block === nil) {
+        block = function() { return true; };
       }
 
-      var proc = function(obj) {
+      var proc = function(s, obj) {
         var value;
 
-        if ((value = block.call(__context, obj)) === __breaker) {
+        if ((value = block(__context, obj)) === __breaker) {
           return __breaker.$v;
         }
 
@@ -123,8 +121,8 @@ module Enumerable
         }
       }
 
-      this.$each._p = proc;
-      this.$each();
+      each._p = proc;
+      each(#{self});
 
       return result;
     }
@@ -134,12 +132,12 @@ module Enumerable
     return enum_for :detect, ifnone unless block_given?
 
     %x{
-      var result = nil;
+      var result = nil, each = #{self}.$m.each;
 
-      this.$each._p = function(obj) {
+      each._p = function(s, obj) {
         var value;
 
-        if ((value = block.call(__context, obj)) === __breaker) {
+        if ((value = block(__context, obj)) === __breaker) {
           return __breaker.$v;
         }
 
@@ -151,14 +149,14 @@ module Enumerable
         }
       };
 
-      this.$each();
+      each(#{self});
 
       if (result !== nil) {
         return result;
       }
 
       if (typeof(ifnone) === 'function') {
-        return ifnone.$call();
+        return #{ ifnone.call };
       }
 
       return ifnone == null ? nil : ifnone;
@@ -168,9 +166,10 @@ module Enumerable
   def drop(number)
     %x{
       var result  = [],
-          current = 0;
+          current = 0,
+          each    = #{self}.$m.each;
 
-      this.$each._p = function(obj) {
+      each._p = function(s, obj) {
         if (number < current) {
           result.push(e);
         }
@@ -178,7 +177,7 @@ module Enumerable
         current++;
       };
 
-      this.$each();
+      each(#{self});
 
       return result;
     }
@@ -188,24 +187,25 @@ module Enumerable
     return enum_for :drop_while unless block_given?
 
     %x{
-      var result = [];
+      var result = [], each = #{self}.$m.each;
 
-      this.$each._p = function(obj) {
+      each._p = function(s, obj) {
         var value;
 
-        if ((value = block.call(__context, obj)) === __breaker) {
+        if ((value = block(__context, obj)) === __breaker) {
           return __breaker;
         }
 
-        if (value !== false && value !== nil) {
+        if (value === false || value === nil) {
           result.push(obj);
+          return value;
         }
-        else {
-          return __breaker;
-        }
+        
+        
+        return __breaker;
       };
 
-      this.$each();
+      each(#{self});
 
       return result;
     }
@@ -215,19 +215,19 @@ module Enumerable
     return enum_for :each_with_index unless block_given?
 
     %x{
-      var index = 0;
+      var index = 0, each = #{self}.$m.each;
 
-      this.$each._p = function(obj) {
+      each._p = function(s, obj) {
         var value;
 
-        if ((value = block.call(__context, obj, index)) === __breaker) {
+        if ((value = block(__context, obj, index)) === __breaker) {
           return __breaker.$v;
         }
 
         index++;
       };
 
-      this.$each();
+      each(#{self});
 
       return nil;
     }
@@ -237,15 +237,17 @@ module Enumerable
     return enum_for :each_with_object unless block_given?
 
     %x{
-      this.$each._p = function(obj) {
+      var each = #{self}.$m.each;
+
+      each._p = function(s, obj) {
         var value;
 
-        if ((value = block.call(__context, obj, object)) === __breaker) {
+        if ((value = block(__context, obj, object)) === __breaker) {
           return __breaker.$v;
         }
       };
 
-      this.$each();
+      each(#{self});
 
       return object;
     }
@@ -253,13 +255,13 @@ module Enumerable
 
   def entries
     %x{
-      var result = [];
+      var result = [], each = #{self}.$m.each;
 
-      this.$each._p = function(obj) {
+      each._p = function(m, obj) {
         result.push(obj);
       };
 
-      this.$each();
+      each(#{self});
 
       return result;
     }
@@ -271,25 +273,21 @@ module Enumerable
     return enum_for :find_all unless block_given?
 
     %x{
-      var result = [];
+      var result = [], each = #{self}.$m.each;
 
-      this.$each._p = function(obj) {
+      each._p = function(s, obj) {
         var value;
 
-        if ((value = block.call(__context, obj)) === __breaker) {
+        if ((value = block(__context, obj)) === __breaker) {
           return __breaker.$v;
         }
 
         if (value !== false && value !== nil) {
-          //result      = obj;
-          //__breaker.$v = nil;
-
-          //return __breaker;
           result.push(obj);
         }
       };
 
-      this.$each();
+      each(#{self});
 
       return result;
     }
@@ -297,11 +295,11 @@ module Enumerable
 
   def find_index(object, &block)
     %x{
-      var proc, result = nil, index = 0;
+      var proc, result = nil, index = 0, each = #{self}.$m.each;
 
       if (object != null) {
-        proc = function (obj) { 
-          if (obj.$eq$(object)) {
+        proc = function (s, obj) { 
+          if (#{ `obj` == `object` }) {
             result = index;
             return __breaker;
           }
@@ -309,12 +307,12 @@ module Enumerable
         };
       }
       else if (block === nil) {
-        return this.$enum_for("find_index");
+        return #{ enum_for 'find_index' };
       } else {
-        proc = function(obj) {
+        proc = function(s, obj) {
           var value;
 
-          if ((value = block.call(__context, obj)) === __breaker) {
+          if ((value = block(__context, obj)) === __breaker) {
             return __breaker.$v;
           }
 
@@ -328,9 +326,8 @@ module Enumerable
         };
       }
 
-      this.$each._p = proc;
-
-      this.$each();
+      #{self}.$m.each._p = proc;
+      #{self}.$m.each(#{self});
 
       return result;
     }
@@ -340,15 +337,16 @@ module Enumerable
     %x{
       var result = [],
           current = 0,
-          proc;
+          proc,
+          each = #{self}.$m.each;
 
       if (number == null) {
         result = nil;
-        proc = function(obj) {
+        proc = function(s, obj) {
             result = obj; return __breaker;
           };
       } else {
-        proc = function(obj) {
+        proc = function(s, obj) {
             if (number <= current) {
               return __breaker;
             }
@@ -359,9 +357,8 @@ module Enumerable
           };
       }
 
-      this.$each._p = proc;
-
-      this.$each();
+      each._p = proc;
+      each(#{self});
 
       return result;
     }
@@ -369,29 +366,29 @@ module Enumerable
 
   def grep(pattern, &block)
     %x{
-      var result = [];
+      var result = [], each = #{self}.$m.each;
 
-      this.$each._p = (block !== nil
-        ? function(obj) {
-            var value = pattern.$eqq$(obj);
+      each._p = (block !== nil
+        ? function(s, obj) {
+            var value = #{pattern === `obj`};
 
             if (value !== false && value !== nil) {
-              if ((value = block.call(__context, obj)) === __breaker) {
+              if ((value = block(__context, obj)) === __breaker) {
                 return __breaker.$v;
               }
 
               result.push(value);
             }
           }
-        : function(obj) {
-            var value = pattern.$eqq$(obj);
+        : function(s, obj) {
+            var value = #{pattern === `obj`};
 
             if (value !== false && value !== nil) {
               result.push(obj);
             }
           });
 
-      this.$each();
+      each(#{self});
 
       return result;
     }