opal 0.3.15 → 0.3.16

data/core/enumerator.rb

@@ -0,0 +1,126 @@
+class Enumerator
+  include Enumerable
+
+  class Yielder
+    def initialize(block)
+      @block = block
+    end
+
+    def call(block)
+      @call = block
+
+      @block.call
+    end
+
+    def yield(value)
+      @call.call(value)
+    end
+
+    alias << yield
+  end
+
+  class Generator
+    attr_reader :enumerator
+
+    def initialize(block)
+      @yielder = Yielder.new(block)
+    end
+
+    def each(&block)
+      @yielder.call(block)
+    end
+  end
+
+  def initialize(object = nil, method = :each, *args, &block)
+    if block_given?
+      @object = Generator.new(block)
+    end
+
+    raise ArgumentError, 'wrong number of argument (0 for 1+)' unless object
+
+    @object = object
+    @method = method
+    @args   = args
+  end
+
+  def next
+    _init_cache
+
+    result    = @cache[@current] or raise StopIteration, 'iteration reached an end'
+    @current += 1
+
+    result
+  end
+
+  def next_values
+    result = self.next
+
+    result.is_a?(Array) ? result : [result]
+  end
+
+  def peek
+    _init_cache
+
+    @cache[@current] or raise StopIteration, 'iteration reached an end'
+  end
+
+  def peel_values
+    result = self.peek
+
+    result.is_a?(Array) ? result : [result]
+  end
+
+  def rewind
+    _clear_cache
+  end
+
+  def each(&block)
+    return self unless block
+
+    @object.__send__ @method, *args, &block
+  end
+
+  def each_with_index(&block)
+    with_index &block
+  end
+
+  def with_index(offset = 0)
+    return Enumerator.new(self, :with_index, offset) unless block_given?
+
+    current = 0
+
+    each {|*args|
+      next unless current >= offset
+
+      yield *args, current
+
+      current += 1
+    }
+  end
+
+  def with_object(object)
+    return Enumerator.new(self, :with_object, object) unless block_given?
+
+    each {|*args|
+      yield *args, object
+    }
+  end
+
+  def _init_cache
+    @current ||= 0
+    @cache   ||= to_a
+  end
+
+  def _clear_cache
+    @cache   = nil
+    @current = nil
+  end
+end
+
+module Kernel
+  def enum_for (method = :each, *args)
+    Enumerator.new(self, method, *args)
+  end
+
+  alias to_enum enum_for
+end

data/core/error.rb

@@ -0,0 +1,40 @@
+class Exception
+  def initialize(message = '')
+    %x{
+      if (Error.captureStackTrace) {
+        Error.captureStackTrace(this);
+      }
+
+      this.message = message;
+    }
+  end
+
+  def backtrace
+    %x{
+      if (this._bt !== undefined) {
+        return this._bt;
+      }
+
+      var backtrace = this.stack;
+
+      if (typeof(backtrace) === 'string') {
+        return this._bt = backtrace.split("\\n");
+      }
+      else if (backtrace) {
+        this._bt = backtrace;
+      }
+
+      return this._bt = ["No backtrace available"];
+    }
+  end
+
+  def inspect
+    "#<#{self.class}: '#{message}'>"
+  end
+
+  def message
+    `this.message`
+  end
+
+  alias to_s message
+end

data/{runtime/corelib → core}/file.rb

@@ -1,4 +1,7 @@
 class File
+  # Regexp to split path into dirname, basename and extname
+  PATH_RE = /^(.+\/(?!$)|\/)?((?:.+?)?(\.[^.]*)?)$/
+
   def self.expand_path(path, base = undefined)
     %x{
       if (!base) {
@@ -43,7 +46,7 @@ class File
 
   def self.dirname(path)
     %x{
-      var dirname = PATH_RE.exec(path)[1];
+      var dirname = #{PATH_RE}.exec(path)[1];
 
       if (!dirname) {
         return '.';
@@ -59,7 +62,7 @@ class File
 
   def self.extname(path)
     %x{
-      var extname = PATH_RE.exec(path)[3];
+      var extname = #{PATH_RE}.exec(path)[3];
 
       if (!extname || extname === '.') {
         return '';
@@ -75,6 +78,6 @@ class File
   end
 
   def self.exist?(path)
-    `opal.loader.factories[#{ expand_path path }] ? true : false`
+    `!!FACTORIES[#{ expand_path path }]`
   end
 end

data/core/gemlib.rb

@@ -0,0 +1,30 @@
+# ...........................................................
+# GEMLIB - only loaded when running inside v8 in gem
+#
+
+# In gem, use 'opal-ruby-. Browser (default) uses 'opal-browser'
+RUBY_ENGINE = 'opal-ruby'
+
+# Update load paths (aliasing does not yet work as planned)
+$: = $LOAD_PATH = `opal_filesystem.find_paths`
+
+$" = $LOADED_FEATURES = []
+
+module Kernel
+  def require(path)
+    %x{
+      var resolved = opal_filesystem.require(#{path}, #{$:});
+
+      if (resolved === false) {
+        return false;
+      }
+      else if (!resolved) {
+        #{ raise LoadError, "cannot load file -- #{path}" };
+      }
+      else {
+        #{ $LOADED_FEATURES << `resolved` };
+        return true;
+      }
+    }
+  end
+end

data/{runtime/corelib → core}/hash.rb

@@ -1,17 +1,35 @@
 class Hash
   include Enumerable
 
+  %x{
+    var hash_class = this;
+
+    $opal.hash = function() {
+      var hash    = new hash_class.$allocator(),
+          args    = $slice.call(arguments),
+          assocs  = {},
+          key;
+
+      hash.map    = assocs;
+      hash.none   = nil;
+      hash.proc   = nil;
+
+      for (var i = 0, length = args.length; i < length; i++) {
+        key = args[i];
+        assocs[key.$hash()] = [key, args[++i]];
+      }
+
+      return hash;
+    };
+  }
+
   def self.[](*objs)
     `$opal.hash.apply(null, objs)`
   end
 
-  def self.allocate
-    `new $opal.hash()`
-  end
-
   def self.new(defaults = undefined, &block)
     %x{
-      var hash = new $opal.hash();
+      var hash = $opal.hash();
 
       if (defaults !== undefined) {
         hash.none = defaults;
@@ -100,7 +118,7 @@ class Hash
 
   def clone
     %x{
-      var result = new $opal.hash(),
+      var result = $opal.hash(),
           map    = this.map,
           map2   = result.map;
 
@@ -154,7 +172,7 @@ class Hash
         var bucket = map[assoc],
             value;
 
-        if ((value = $yield.call($context, null, bucket[0], bucket[1])) === $breaker) {
+        if ((value = $yield.call($context, bucket[0], bucket[1])) === $breaker) {
           return $breaker.$v;
         }
 
@@ -176,7 +194,7 @@ class Hash
       for (var assoc in map) {
         var bucket = map[assoc];
 
-        if ($yield.call($context, null, bucket[0], bucket[1]) === $breaker) {
+        if ($yield.call($context, bucket[0], bucket[1]) === $breaker) {
           return $breaker.$v;
         }
       }
@@ -194,7 +212,7 @@ class Hash
       for (var assoc in map) {
         var bucket = map[assoc];
 
-        if ($yield.call($context, null, bucket[0]) === $breaker) {
+        if ($yield.call($context, bucket[0]) === $breaker) {
           return $breaker.$v;
         }
       }
@@ -203,7 +221,7 @@ class Hash
     }
   end
 
-  alias_method :each_pair, :each
+  alias each_pair each
 
   def each_value(&block)
     return enum_for :each_value unless block_given?
@@ -214,7 +232,7 @@ class Hash
       for (var assoc in map) {
         var bucket = map[assoc];
 
-        if ($yield.call($context, null, bucket[1]) === $breaker) {
+        if ($yield.call($context, bucket[1]) === $breaker) {
           return $breaker.$v;
         }
       }
@@ -233,7 +251,7 @@ class Hash
     }
   end
 
-  alias_method :eql?, :==
+  alias eql? ==
 
   def fetch(key, defaults = undefined, &block)
     %x{
@@ -242,7 +260,7 @@ class Hash
       if (block !== nil) {
         var value;
 
-        if ((value = $yield.call($context, null, key)) === $breaker) {
+        if ((value = $yield.call($context, key)) === $breaker) {
           return $breaker.$v;
         }
 
@@ -274,7 +292,7 @@ class Hash
             result.push(value);
           }
           else {
-            result = result.concat(#{value.flatten(level - 1)});
+            result = result.concat(#{`value`.flatten(level - 1)});
           }
         }
         else {
@@ -350,7 +368,7 @@ class Hash
     }
   end
 
-  alias_method :key?, :has_key?
+  alias key? has_key?
 
   def keys
     %x{
@@ -376,7 +394,7 @@ class Hash
     }
   end
 
-  alias_method :member?, :has_key?
+  alias member? has_key?
 
   def merge(other)
     %x{
@@ -447,7 +465,7 @@ class Hash
     }
   end
 
-  alias_method :size, :length
+  alias size length
 
   def to_a
     %x{
@@ -468,25 +486,9 @@ class Hash
     self
   end
 
-  def to_native
-    %x{
-      var map    = this.map,
-          result = {};
-
-      for (var assoc in map) {
-        var key   = map[assoc][0],
-            value = map[assoc][1];
-
-        result[key] = #{Opal.object?(`value`) ? `value`.to_native : `value`};
-      }
-
-      return result;
-    }
-  end
-
-  alias_method :to_s, :inspect
+  alias to_s inspect
 
-  alias_method :update, :merge!
+  alias update merge!
 
   def values
     %x{

data/{runtime/corelib → core}/kernel.rb

@@ -7,21 +7,19 @@ module Kernel
     `this == other`
   end
 
-  def Object (object)
-    Opal.native?(object) ? Native::Object.new(object) : object
-  end
-
   def Array(object)
     return [] unless object
 
-    unless Opal.native?(object)
-      return object.to_ary if object.respond_to? :to_ary
-      return object.to_a   if object.respond_to? :to_a
-    end
-
     %x{
+      if (object.$to_ary) {
+        return #{object.to_ary};
+      }
+      else if (object.$to_a) {
+        return #{object.to_a};
+      }
+
       var length = object.length || 0,
-          result = new Array(length);
+          result = [];
 
       while (length--) {
         result[length] = object[length];
@@ -86,7 +84,7 @@ module Kernel
   end
 
   def instance_variable_defined?(name)
-    `this.hasOwnProperty(name.substr(1));`
+    `hasOwnProperty.call(this, name.substr(1))`
   end
 
   def instance_variable_get(name)
@@ -129,7 +127,7 @@ module Kernel
     }
   end
 
-  alias_method :kind_of?, :is_a?
+  alias kind_of? is_a?
 
   def lambda(&block)
     block
@@ -140,7 +138,7 @@ module Kernel
 
     %x{
       while (true) {
-        if ($yield.call($context, null) === breaker) {
+        if ($yield.call($context) === breaker) {
           return breaker.$v;
         }
       }
@@ -161,17 +159,26 @@ module Kernel
     $stdout.print *strs
   end
 
+  def private(*)
+  end
+
   def proc(&block)
     block
   end
 
+  def protected(*)
+  end
+
+  def public(*)
+  end
+
   def puts(*strs)
     $stdout.puts *strs
   end
 
   def raise(exception, string = undefined)
     %x{
-      if (#{Opal.string?(exception)}) {
+      if (typeof(exception) === 'string') {
         exception = #{`RubyRuntimeError`.new `exception`};
       }
       else if (#{!exception.is_a? `RubyException`}) {
@@ -199,18 +206,16 @@ module Kernel
       }
 
       LOADER_CACHE[resolved] = true;
+      FEATURES.push(resolved);
       $opal.FILE = resolved;
-      FACTORIES[resolved].call(top_self, resolved, $opal);
+      FACTORIES[resolved]();
 
       return true;
     }
   end
 
   def respond_to?(name)
-    %x{
-      var meth = this[mid_to_jsid(name)];
-      return !!meth;
-    }
+    `!!this[mid_to_jsid(name)]`
   end
 
   def singleton_class
@@ -223,7 +228,7 @@ module Kernel
         raise(RubyLocalJumpError, 'no block given');
       }
 
-      if ($yield.call($context, null, this) === breaker) {
+      if ($yield.call($context, this) === breaker) {
         return breaker.$v;
       }
 
@@ -232,6 +237,6 @@ module Kernel
   end
 
   def to_s
-    `inspect_object(this)`
+    `return "#<" + class_real(this.$klass).$name + ":0x" + (this.$id * 400487).toString(16) + ">";`
   end
 end