opal 0.6.3 → 0.7.0.beta1

data/opal/corelib/enumerator.rb

@@ -61,7 +61,7 @@ class Enumerator
     %x{
       var result
 
-      self.$each._p = function() {
+      self.$each.$$p = function() {
         var param = #{Opal.destructure(`arguments`)},
             value = block(param, index);
 

data/opal/corelib/error.rb

@@ -4,8 +4,8 @@ class Exception
   def self.new(message = '')
     %x{
       var err = new Error(message);
-      err._klass = self;
-      err.name = self._name;
+      err.$$class = self;
+      err.name = self.$$name;
       return err;
     }
   end

data/opal/corelib/file.rb

@@ -0,0 +1,56 @@
+class File < IO
+  Separator = SEPARATOR = '/'
+
+  class << self
+    def expand_path(path, basedir = nil)
+      path = [basedir, path].compact.join(SEPARATOR)
+      parts = path.split(SEPARATOR)
+      new_parts = []
+      parts[0] = Dir.home if parts.first == '~'
+
+      parts.each do |part|
+        if part == '..'
+          new_parts.pop
+        else
+          new_parts << part
+        end
+      end
+      new_parts.join(SEPARATOR)
+    end
+
+    def dirname(path)
+      split(path)[0..-2]
+    end
+
+    def basename(path)
+      split(path)[-1]
+    end
+
+    def exist? path
+      `Opal.modules[#{path}] != null`
+    end
+    alias exists? exist?
+
+    def directory?(path)
+      files = []
+      %x{
+        for (var key in Opal.modules) {
+          #{files}.push(key)
+        }
+      }
+      path = path.gsub(%r{(^.#{SEPARATOR}+|#{SEPARATOR}+$)})
+      file = files.find do |file|
+        file =~ /^#{path}/
+      end
+      file
+    end
+
+    def join(*paths)
+      paths.join(SEPARATOR).gsub(%r{#{SEPARATOR}+}, SEPARATOR)
+    end
+
+    def split(path)
+      path.split(SEPARATOR)
+    end
+  end
+end

data/opal/corelib/hash.rb

@@ -9,7 +9,7 @@ class Hash
 
   def self.allocate
     %x{
-      var hash = new self._alloc;
+      var hash = new self.$$alloc;
 
       hash.map  = {};
       hash.keys = [];
@@ -125,7 +125,7 @@ class Hash
         map[key] = value;
       }
 
-      var hash = new self._klass._alloc();
+      var hash = new self.$$class.$$alloc();
 
       hash.map  = map;
       hash.keys = keys;
@@ -313,7 +313,7 @@ class Hash
 
         result.push(key);
 
-        if (value._isArray) {
+        if (value.$$is_array) {
           if (level == null || level === 1) {
             result.push(value);
           }
@@ -347,7 +347,7 @@ class Hash
   end
 
   def hash
-    `self._id`
+    `self.$$id`
   end
 
   alias include? has_key?
@@ -689,7 +689,7 @@ class Hash
 
   def to_h
     %x{
-      var hash   = new Opal.Hash._alloc,
+      var hash   = new Opal.Hash.$$alloc,
           cloned = #{clone};
 
       hash.map  = cloned.map;

data/opal/corelib/helpers.rb

@@ -64,7 +64,7 @@ module Opal
       if (args.length == 1) {
         return args[0];
       }
-      else if (args._isArray) {
+      else if (args.$$is_array) {
         return args;
       }
       else {
@@ -75,7 +75,7 @@ module Opal
 
   def self.respond_to?(obj, method)
     %x{
-      if (obj == null || !obj._klass) {
+      if (obj == null || !obj.$$class) {
         return false;
       }
     }
@@ -91,7 +91,7 @@ module Opal
       else if (obj === null) {
         return "null";
       }
-      else if (!obj._klass) {
+      else if (!obj.$$class) {
         return obj.toString();
       }
       else {

data/opal/corelib/io.rb

@@ -3,19 +3,28 @@ class IO
   SEEK_CUR = 1
   SEEK_END = 2
 
+  attr_accessor :write_proc
+
+  def write(string)
+    `self.write_proc(string)`
+    string.size
+  end
+
   module Writable
     def <<(string)
       write(string)
-
       self
     end
 
     def print(*args)
       write args.map { |arg| String(arg) }.join($,)
+      nil
     end
 
     def puts(*args)
-      write args.map { |arg| String(arg) }.join($/)
+      newline = $/
+      write args.map { |arg| String(arg).chomp }.concat([nil]).join(newline)
+      nil
     end
   end
 
@@ -42,15 +51,9 @@ STDERR = $stderr = IO.new
 STDIN  = $stdin  = IO.new
 STDOUT = $stdout = IO.new
 
-def $stdout.write(string)
-  `console.log(#{string.to_s});`
-  nil
-end
 
-def $stderr.write(string)
-  `console.warn(#{string.to_s});`
-  nil
-end
+$stdout.write_proc = `typeof(process) === 'object' ? function(s){process.stdout.write(s)} : function(s){console.log(s)}`
+$stderr.write_proc = `typeof(process) === 'object' ? function(s){process.stderr.write(s)} : function(s){console.warn(s)}`
 
 $stdout.extend(IO::Writable)
 $stderr.extend(IO::Writable)

data/opal/corelib/kernel.rb

@@ -25,7 +25,7 @@ module Kernel
     %x{
       var meth = self['$' + name];
 
-      if (!meth || meth.rb_stub) {
+      if (!meth || meth.$$stub) {
         #{raise NameError, "undefined method `#{name}' for class `#{self.class.name}'"};
       }
 
@@ -44,7 +44,7 @@ module Kernel
               continue;
             }
           }
-          if (self[key].rb_stub === undefined) {
+          if (self[key].$$stub === undefined) {
             methods.push(key.substr(1));
           }
         }
@@ -78,16 +78,14 @@ module Kernel
   end
 
   def class
-    `self._klass`
+    `self.$$class`
   end
 
   def copy_instance_variables(other)
     %x{
       for (var name in other) {
         if (name.charAt(0) !== '$') {
-          if (name !== '_id' && name !== '_klass') {
-            self[name] = other[name];
-          }
+          self[name] = other[name];
         }
       }
     }
@@ -113,11 +111,11 @@ module Kernel
 
     %x{
       var jsid   = '$' + name;
-      body._jsid = name;
-      body._s    = null;
-      body._def  = body;
+      body.$$jsid = name;
+      body.$$s    = null;
+      body.$$def  = body;
 
-      #{singleton_class}._proto[jsid] = body;
+      #{singleton_class}.$$proto[jsid] = body;
 
       return self;
     }
@@ -204,7 +202,7 @@ module Kernel
         switch (spec) {
         case 'c':
           obj = args[idx];
-          if (obj._isString) {
+          if (obj.$$is_string) {
             str = obj.charAt(0);
           } else {
             str = String.fromCharCode(#{`obj`.to_i});
@@ -291,7 +289,7 @@ module Kernel
   end
 
   def hash
-    `self._id`
+    `self.$$id`
   end
 
   def initialize_copy(other)
@@ -302,7 +300,7 @@ module Kernel
   end
 
   def instance_of?(klass)
-    `self._klass === klass`
+    `self.$$class === klass`
   end
 
   def instance_variable_defined?(name)
@@ -327,7 +325,7 @@ module Kernel
 
       for (var name in self) {
         if (name.charAt(0) !== '$') {
-          if (name !== '_klass' && name !== '_id') {
+          if (name !== '$$class' && name !== '$$id') {
             result.push('@' + name);
           }
         }
@@ -392,7 +390,7 @@ module Kernel
   alias kind_of? is_a?
 
   def lambda(&block)
-    `block.is_lambda = true`
+    `block.$$is_lambda = true`
 
     block
   end
@@ -423,16 +421,17 @@ module Kernel
     nil
   end
 
-  def private_methods
+  def private_methods(*)
     []
   end
+  alias private_instance_methods private_methods
 
   def proc(&block)
     unless block
       raise ArgumentError, "tried to create Proc object without a block"
     end
 
-    `block.is_lambda = false`
+    `block.$$is_lambda = false`
     block
   end
 
@@ -452,7 +451,6 @@ module Kernel
 
   def warn(*strs)
     $stderr.puts(*strs) unless $VERBOSE.nil? || strs.empty?
-    nil
   end
 
   def raise(exception = undefined, string = undefined)
@@ -460,7 +458,7 @@ module Kernel
       if (exception == null && #$!) {
         exception = #$!;
       }
-      else if (exception._isString) {
+      else if (exception.$$is_string) {
         exception = #{RuntimeError.new exception};
       }
       else if (!#{exception.is_a? Exception}) {
@@ -479,7 +477,7 @@ module Kernel
       if (max === undefined) {
         return Math.random();
       }
-      else if (max._isRange) {
+      else if (max.$$is_range) {
         var arr = #{max.to_a};
 
         return arr[#{rand(`arr.length`)}];
@@ -499,7 +497,7 @@ module Kernel
     %x{
       var body = self['$' + name];
 
-      if (typeof(body) === "function" && !body.rb_stub) {
+      if (typeof(body) === "function" && !body.$$stub) {
         return true;
       }
     }
@@ -511,52 +509,7 @@ module Kernel
   alias public_send __send__
 
   def singleton_class
-    %x{
-      if (self._isClass) {
-        if (self.__meta__) {
-          return self.__meta__;
-        }
-
-        var meta = new $opal.Class._alloc;
-        meta._klass = $opal.Class;
-        self.__meta__ = meta;
-        // FIXME - is this right? (probably - methods defined on
-        // class' singleton should also go to subclasses?)
-        meta._proto = self.constructor.prototype;
-        meta._isSingleton = true;
-        meta.__inc__ = [];
-        meta._methods = [];
-
-        meta._scope = self._scope;
-
-        return meta;
-      }
-
-      if (self._isClass) {
-        return self._klass;
-      }
-
-      if (self.__meta__) {
-        return self.__meta__;
-      }
-
-      else {
-        var orig_class = self._klass,
-            class_id   = "#<Class:#<" + orig_class._name + ":" + orig_class._id + ">>";
-
-        var Singleton = function () {};
-        var meta = Opal.boot(orig_class, Singleton);
-        meta._name = class_id;
-
-        meta._proto = self;
-        self.__meta__ = meta;
-        meta._klass = orig_class._klass;
-        meta._scope = orig_class._scope;
-        meta.__parent = orig_class;
-
-        return meta;
-      }
-    }
+    %x{$opal.get_singleton_class(self)}
   end
 
   alias sprintf format
@@ -575,7 +528,7 @@ module Kernel
   end
 
   def to_s
-    `"#<" + #{self.class.name} + ":" + self._id + ">"`
+    `"#<" + #{self.class.name} + ":" + self.$$id + ">"`
   end
 
   def freeze
@@ -590,4 +543,27 @@ module Kernel
   def respond_to_missing?(method_name)
     false
   end
+
+  def require file
+    `$opal.require( $opal.normalize_loadable_path(#{file}) )`
+  end
+
+  # `path` should be the ful path to be found in registered modules (`Opal.modules`)
+  def require_tree path
+    %x{
+      var file_name, file_names = Object.keys($opal.modules);
+      path = path.replace(/\/?$/, '/');
+      for (var i = 0; i < file_names.length; i++) {
+        file_name = file_names[i];
+        if (file_name['$start_with?'](path)) {
+          $opal.require(file_name);
+        }
+      }
+    }
+    nil
+  end
+
+  def load file
+    `$opal.load( $opal.normalize_loadable_path(#{file}) )`
+  end
 end

data/opal/corelib/method.rb

@@ -14,7 +14,7 @@ class Method
 
   def call(*args, &block)
     %x{
-      #@method._p = block;
+      #@method.$$p = block;
 
       return #@method.apply(#@receiver, args);
     }

data/opal/corelib/module.rb

@@ -2,21 +2,21 @@ class Module
   def self.new(&block)
     %x{
       function AnonModule(){}
-      var klass     = Opal.boot(Opal.Module, AnonModule);
-      klass._name   = nil;
-      klass._klass  = Opal.Module;
-      klass.__dep__ = []
-      klass.__mod__ = true;
-      klass._proto  = {};
+      var klass      = Opal.boot(Opal.Module, AnonModule);
+      klass.$$name   = nil;
+      klass.$$class  = Opal.Module;
+      klass.$$dep    = []
+      klass.$$is_mod = true;
+      klass.$$proto  = {};
 
       // inherit scope from parent
-      $opal.create_scope(Opal.Module._scope, klass);
+      $opal.create_scope(Opal.Module.$$scope, klass);
 
       if (block !== nil) {
-        var block_self = block._s;
-        block._s = null;
+        var block_self = block.$$s;
+        block.$$s = null;
         block.call(klass);
-        block._s = block_self;
+        block.$$s = block_self;
       }
 
       return klass;
@@ -38,7 +38,7 @@ class Module
           return true;
         }
 
-        working = working.__parent;
+        working = working.$$parent;
       }
 
       return false;
@@ -47,9 +47,9 @@ class Module
 
   def alias_method(newname, oldname)
     %x{
-      self._proto['$' + newname] = self._proto['$' + oldname];
+      self.$$proto['$' + newname] = self.$$proto['$' + oldname];
 
-      if (self._methods) {
+      if (self.$$methods) {
         $opal.donate(self, ['$' + newname ])
       }
     }
@@ -57,7 +57,7 @@ class Module
   end
 
   def alias_native(mid, jsid = mid)
-    `self._proto['$' + mid] = self._proto[jsid]`
+    `self.$$proto['$' + mid] = self.$$proto[jsid]`
   end
 
   def ancestors
@@ -67,9 +67,9 @@ class Module
 
       while (parent) {
         result.push(parent);
-        result = result.concat(parent.__inc__);
+        result = result.concat(parent.$$inc);
 
-        parent = parent._super;
+        parent = parent.$$super;
       }
 
       return result;
@@ -77,56 +77,7 @@ class Module
   end
 
   def append_features(klass)
-    %x{
-      var module   = self,
-          included = klass.__inc__;
-
-      // check if this module is already included in the klass
-      for (var i = 0, length = included.length; i < length; i++) {
-        if (included[i] === module) {
-          return;
-        }
-      }
-
-      included.push(module);
-      module.__dep__.push(klass);
-
-      // iclass
-      var iclass = {
-        name: module._name,
-
-        _proto:   module._proto,
-        __parent: klass.__parent,
-        __iclass: true
-      };
-
-      klass.__parent = iclass;
-
-      var donator   = module._proto,
-          prototype = klass._proto,
-          methods   = module._methods;
-
-      for (var i = 0, length = methods.length; i < length; i++) {
-        var method = methods[i];
-
-        if (prototype.hasOwnProperty(method) && !prototype[method]._donated) {
-          // if the target class already has a method of the same name defined
-          // and that method was NOT donated, then it must be a method defined
-          // by the class so we do not want to override it
-        }
-        else {
-          prototype[method] = donator[method];
-          prototype[method]._donated = true;
-        }
-      }
-
-      if (klass.__dep__) {
-        $opal.donate(klass, methods.slice(), true);
-      }
-
-      $opal.donate_constants(module, klass);
-    }
-
+    `Opal.append_features(self, klass)`
     self
   end
 
@@ -137,13 +88,13 @@ class Module
 
   def attr_reader(*names)
     %x{
-      var proto = self._proto, cls = self;
+      var proto = self.$$proto, cls = self;
       for (var i = 0, length = names.length; i < length; i++) {
         (function(name) {
           proto[name] = nil;
           var func = function() { return this[name] };
 
-          if (cls._isSingleton) {
+          if (cls.$$is_singleton) {
             proto.constructor.prototype['$' + name] = func;
           }
           else {
@@ -159,13 +110,13 @@ class Module
 
   def attr_writer(*names)
     %x{
-      var proto = self._proto, cls = self;
+      var proto = self.$$proto, cls = self;
       for (var i = 0, length = names.length; i < length; i++) {
         (function(name) {
           proto[name] = nil;
           var func = function(value) { return this[name] = value; };
 
-          if (cls._isSingleton) {
+          if (cls.$$is_singleton) {
             proto.constructor.prototype['$' + name + '='] = func;
           }
           else {
@@ -180,8 +131,21 @@ class Module
 
   alias attr attr_accessor
 
+  def autoload(const, path)
+    %x{
+      var autoloaders;
+
+      if (!(autoloaders = self.$$autoload)) {
+        autoloaders = self.$$autoload = {};
+      }
+
+      autoloaders[#{const}] = #{path};
+      return nil;
+    }
+  end
+
   def constants
-    `self._scope.constants`
+    `self.$$scope.constants`
   end
 
   # check for constant within current scope
@@ -190,12 +154,12 @@ class Module
     raise NameError, "wrong constant name #{name}" unless name =~ /^[A-Z]\w*$/
 
     %x{
-      scopes = [self._scope];
+      scopes = [self.$$scope];
       if (inherit || self === Opal.Object) {
-        var parent = self._super;
+        var parent = self.$$super;
         while (parent !== Opal.BasicObject) {
-          scopes.push(parent._scope);
-          parent = parent._super;
+          scopes.push(parent.$$scope);
+          parent = parent.$$super;
         }
       }
 
@@ -213,12 +177,12 @@ class Module
     raise NameError, "wrong constant name #{name}" unless name =~ /^[A-Z]\w*$/
 
     %x{
-      var scopes = [self._scope];
+      var scopes = [self.$$scope];
       if (inherit || self == Opal.Object) {
-        var parent = self._super;
+        var parent = self.$$super;
         while (parent !== Opal.BasicObject) {
-          scopes.push(parent._scope);
-          parent = parent._super;
+          scopes.push(parent.$$scope);
+          parent = parent.$$super;
         }
       }
 
@@ -233,7 +197,16 @@ class Module
   end
 
   def const_missing(const)
-    name = `self._name`
+    %x{
+      var autoloader;
+
+      if (self.$$autoload && (autoloader = self.$$autoload[#{const}])) {
+        self.$require(autoloader);
+        return self.$$scope.get(#{const});
+      }
+    }
+
+    name = `self.$$name`
 
     raise NameError, "uninitialized constant #{name}::#{const}"
   end
@@ -264,11 +237,11 @@ class Module
       }
 
       var jsid    = '$' + name;
-      block._jsid = name;
-      block._s    = null;
-      block._def  = block;
+      block.$$jsid = name;
+      block.$$s    = null;
+      block.$$def  = block;
 
-      self._proto[jsid] = block;
+      self.$$proto[jsid] = block;
       $opal.donate(self, [jsid]);
 
       return name;
@@ -278,8 +251,8 @@ class Module
   def remove_method(name)
     %x{
       var jsid    = '$' + name;
-      var current = self._proto[jsid];
-      delete self._proto[jsid];
+      var current = self.$$proto[jsid];
+      delete self.$$proto[jsid];
 
       // Check if we need to reverse $opal.donate
       // $opal.retire(self, [jsid]);
@@ -307,8 +280,8 @@ class Module
   def include?(mod)
     %x{
       for (var cls = self; cls; cls = cls.parent) {
-        for (var i = 0; i != cls.__inc__.length; i++) {
-          var mod2 = cls.__inc__[i];
+        for (var i = 0; i != cls.$$inc.length; i++) {
+          var mod2 = cls.$$inc[i];
           if (mod === mod2) {
             return true;
           }
@@ -320,9 +293,9 @@ class Module
 
   def instance_method(name)
     %x{
-      var meth = self._proto['$' + name];
+      var meth = self.$$proto['$' + name];
 
-      if (!meth || meth.rb_stub) {
+      if (!meth || meth.$$stub) {
         #{raise NameError, "undefined method `#{name}' for class `#{self.name}'"};
       }
 
@@ -332,14 +305,14 @@ class Module
 
   def instance_methods(include_super = false)
     %x{
-      var methods = [], proto = self._proto;
+      var methods = [], proto = self.$$proto;
 
-      for (var prop in self._proto) {
+      for (var prop in self.$$proto) {
         if (!include_super && !proto.hasOwnProperty(prop)) {
           continue;
         }
 
-        if (!include_super && proto[prop]._donated) {
+        if (!include_super && proto[prop].$$donated) {
           continue;
         }
 
@@ -362,12 +335,12 @@ class Module
     raise ArgumentError, 'no block given' unless block
 
     %x{
-      var old = block._s,
+      var old = block.$$s,
           result;
 
-      block._s = null;
+      block.$$s = null;
       result = block.call(self);
-      block._s = old;
+      block.$$s = old;
 
       return result;
     }
@@ -381,11 +354,11 @@ class Module
         throw new Error("no block given");
       }
 
-      var block_self = block._s, result;
+      var block_self = block.$$s, result;
 
-      block._s = null;
+      block.$$s = null;
       result = block.apply(self, $slice.call(arguments));
-      block._s = block_self;
+      block.$$s = block_self;
 
       return result;
     }
@@ -395,15 +368,15 @@ class Module
 
   def method_defined?(method)
     %x{
-      var body = self._proto['$' + method];
-      return (!!body) && !body.rb_stub;
+      var body = self.$$proto['$' + method];
+      return (!!body) && !body.$$stub;
     }
   end
 
   def module_function(*methods)
     %x{
       for (var i = 0, length = methods.length; i < length; i++) {
-        var meth = methods[i], func = self._proto['$' + meth];
+        var meth = methods[i], func = self.$$proto['$' + meth];
 
         self.constructor.prototype['$' + meth] = func;
       }
@@ -414,20 +387,20 @@ class Module
 
   def name
     %x{
-      if (self._full_name) {
-        return self._full_name;
+      if (self.$$full_name) {
+        return self.$$full_name;
       }
 
       var result = [], base = self;
 
       while (base) {
-        if (base._name === nil) {
+        if (base.$$name === nil) {
           return result.length === 0 ? nil : result.join('::');
         }
 
-        result.unshift(base._name);
+        result.unshift(base.$$name);
 
-        base = base._base_module;
+        base = base.$$base_module;
 
         if (base === $opal.Object) {
           break;
@@ -438,19 +411,21 @@ class Module
         return nil;
       }
 
-      return self._full_name = result.join('::');
+      return self.$$full_name = result.join('::');
     }
   end
 
   def public(*)
   end
 
+  alias private public
+  alias protected public
+  alias nesting public
+
   def private_class_method(name)
     `self['$' + name] || nil`
   end
-
-  alias private public
-  alias protected public
+  alias public_class_method private_class_method
 
   def private_method_defined?(obj)
     false
@@ -470,8 +445,8 @@ class Module
 
   def remove_const(name)
     %x{
-      var old = self._scope[name];
-      delete self._scope[name];
+      var old = self.$$scope[name];
+      delete self.$$scope[name];
       return old;
     }
   end
@@ -481,7 +456,7 @@ class Module
   end
 
   def undef_method(symbol)
-    `$opal.add_stub_for(self._proto, "$" + symbol)`
+    `$opal.add_stub_for(self.$$proto, "$" + symbol)`
     self
   end
 end