opal 1.0.1 → 1.1.0.rc1

data/opal/corelib/enumerator.rb

@@ -1,3 +1,5 @@
+# helpers: breaker, slice, falsy, truthy, coerce_to
+
 require 'corelib/enumerable'
 
 class Enumerator
@@ -25,8 +27,8 @@ class Enumerator
       @args   = []
       @size   = `arguments[0] || nil`
 
-      if @size
-        @size = Opal.coerce_to @size, Integer, :to_int
+      if @size && !@size.respond_to?(:call)
+        @size = `$coerce_to(#{@size}, #{Integer}, 'to_int')`
       end
     else
       @object = `arguments[0]`
@@ -47,12 +49,12 @@ class Enumerator
   end
 
   def size
-    Proc === @size ? @size.call(*@args) : @size
+    @size.respond_to?(:call) ? @size.call(*@args) : @size
   end
 
   def with_index(offset = 0, &block)
     offset = if offset
-               Opal.coerce_to offset, Integer, :to_int
+               `$coerce_to(offset, #{Integer}, 'to_int')`
              else
                0
              end
@@ -77,6 +79,13 @@ class Enumerator
 
   alias with_object each_with_object
 
+  def each_with_index(&block)
+    return enum_for(:each_with_index) { size } unless block_given?
+
+    super
+    @object
+  end
+
   def inspect
     result = "#<#{self.class}: #{@object.inspect}:#{@method}"
 
@@ -213,7 +222,7 @@ class Enumerator
     end
 
     def drop(n)
-      n = Opal.coerce_to n, Integer, :to_int
+      n = `$coerce_to(#{n}, #{Integer}, 'to_int')`
 
       if n < 0
         raise ArgumentError, 'attempt to drop negative size'
@@ -247,7 +256,7 @@ class Enumerator
           %x{
             var value = Opal.yieldX(block, args);
 
-            if (#{Opal.falsy?(`value`)}) {
+            if ($falsy(value)) {
               succeeding = false;
 
               #{enum.yield(*args)};
@@ -263,6 +272,8 @@ class Enumerator
       self.class.for(self, method, *args, &block)
     end
 
+    alias filter find_all
+
     def find_all(&block)
       unless block
         raise ArgumentError, 'tried to call lazy select without a block'
@@ -272,7 +283,7 @@ class Enumerator
         %x{
           var value = Opal.yieldX(block, args);
 
-          if (#{Opal.truthy?(`value`)}) {
+          if ($truthy(value)) {
             #{enum.yield(*args)};
           }
         }
@@ -288,7 +299,7 @@ class Enumerator
             var param = #{Opal.destructure(args)},
                 value = #{pattern === `param`};
 
-            if (#{Opal.truthy?(`value`)}) {
+            if ($truthy(value)) {
               value = Opal.yield1(block, param);
 
               #{enum.yield `Opal.yield1(block, param)`};
@@ -301,7 +312,7 @@ class Enumerator
             var param = #{Opal.destructure(args)},
                 value = #{pattern === `param`};
 
-            if (#{Opal.truthy?(`value`)}) {
+            if ($truthy(value)) {
               #{enum.yield `param`};
             }
           }
@@ -322,7 +333,7 @@ class Enumerator
         %x{
           var value = Opal.yieldX(block, args);
 
-          if (#{Opal.falsy?(`value`)}) {
+          if ($falsy(value)) {
             #{enum.yield(*args)};
           }
         }
@@ -330,7 +341,7 @@ class Enumerator
     end
 
     def take(n)
-      n = Opal.coerce_to n, Integer, :to_int
+      n = `$coerce_to(#{n}, #{Integer}, 'to_int')`
 
       if n < 0
         raise ArgumentError, 'attempt to take negative size'
@@ -363,7 +374,7 @@ class Enumerator
         %x{
           var value = Opal.yieldX(block, args);
 
-          if (#{Opal.truthy?(`value`)}) {
+          if ($truthy(value)) {
             #{enum.yield(*args)};
           }
           else {
@@ -379,4 +390,8 @@ class Enumerator
       "#<#{self.class}: #{@enumerator.inspect}>"
     end
   end
+
+  class ArithmeticSequence < self
+    # We need to stub this for the time being
+  end
 end

data/opal/corelib/file.rb

@@ -1,3 +1,5 @@
+# helpers: truthy
+
 class File < IO
   Separator = SEPARATOR = '/'
   ALT_SEPARATOR = nil
@@ -77,7 +79,7 @@ class File < IO
     %x{
       // Coerce a given path to a path string using #to_path and #to_str
       function $coerce_to_path(path) {
-        if (#{Opal.truthy?(`path`.respond_to?(:to_path))}) {
+        if ($truthy(#{`path`.respond_to?(:to_path)})) {
           path = path.$to_path();
         }
 

data/opal/corelib/hash.rb

@@ -988,6 +988,9 @@ class Hash
     }
   end
 
+  alias filter select
+  alias filter! select!
+
   def shift
     %x{
       var keys = self.$$keys,
@@ -1046,7 +1049,9 @@ class Hash
     }
   end
 
-  def to_h
+  def to_h(&block)
+    return map(&block).to_h if block_given?
+
     %x{
       if (self.$$class === Opal.Hash) {
         return self;

data/opal/corelib/helpers.rb

@@ -1,45 +1,29 @@
+# helpers: type_error, coerce_to
+
 module Opal
   def self.bridge(constructor, klass)
     `Opal.bridge(constructor, klass)`
   end
 
-  def self.type_error(object, type, method = nil, coerced = nil)
-    if method && coerced
-      TypeError.new "can't convert #{object.class} into #{type} (#{object.class}##{method} gives #{coerced.class})"
-    else
-      TypeError.new "no implicit conversion of #{object.class} into #{type}"
-    end
-  end
-
-  def self.coerce_to(object, type, method)
-    return object if type === object
-
-    unless object.respond_to? method
-      raise type_error(object, type)
-    end
-
-    object.__send__ method
-  end
-
-  def self.coerce_to!(object, type, method)
-    coerced = coerce_to(object, type, method)
+  def self.coerce_to!(object, type, method, *args)
+    coerced = `$coerce_to(object, type, method, args)`
 
     unless type === coerced
-      raise type_error(object, type, method, coerced)
+      raise `$type_error(object, type, method, coerced)`
     end
 
     coerced
   end
 
-  def self.coerce_to?(object, type, method)
+  def self.coerce_to?(object, type, method, *args)
     return unless object.respond_to? method
 
-    coerced = coerce_to(object, type, method)
+    coerced = `$coerce_to(object, type, method, args)`
 
     return if coerced.nil?
 
     unless type === coerced
-      raise type_error(object, type, method, coerced)
+      raise `$type_error(object, type, method, coerced)`
     end
 
     coerced
@@ -90,10 +74,6 @@ module Opal
     obj.respond_to?(method, include_all)
   end
 
-  def self.inspect_obj(obj)
-    `Opal.inspect(obj)`
-  end
-
   def self.instance_variable_name!(name)
     name = Opal.coerce_to!(name, String, :to_str)
 

data/opal/corelib/io.rb

@@ -31,17 +31,22 @@ class IO
     end
 
     def print(*args)
-      write args.map { |arg| String(arg) }.join($,)
+      %x{
+        for (var i = 0, ii = args.length; i < ii; i++) {
+          args[i] = #{String(`args[i]`)}
+        }
+        self.$write(args.join(#{$,}));
+      }
       nil
     end
 
     def puts(*args)
-      newline = $/
-      if args.empty?
-        write $/
-      else
-        write args.map { |arg| String(arg).chomp }.concat([nil]).join(newline)
-      end
+      %x{
+        for (var i = 0, ii = args.length; i < ii; i++) {
+          args[i] = #{String(`args[i]`).chomp}
+        }
+        self.$write(args.concat([nil]).join(#{$/}));
+      }
       nil
     end
   end

data/opal/corelib/kernel.rb

@@ -1,3 +1,5 @@
+# helpers: truthy, coerce_to, respond_to
+
 module Kernel
   def method_missing(symbol, *args, &block)
     raise NoMethodError.new("undefined method `#{symbol}' for #{inspect}", symbol, args)
@@ -44,7 +46,7 @@ module Kernel
 
   def methods(all = true)
     %x{
-      if (#{Opal.truthy?(all)}) {
+      if ($truthy(#{all})) {
         return Opal.methods(self);
       } else {
         return Opal.own_methods(self);
@@ -54,7 +56,7 @@ module Kernel
 
   def public_methods(all = true)
     %x{
-      if (#{Opal.truthy?(all)}) {
+      if ($truthy(#{all})) {
         return Opal.methods(self);
       } else {
         return Opal.receiver_methods(self);
@@ -87,12 +89,25 @@ module Kernel
   def at_exit(&block)
     $__at_exit__ ||= []
     $__at_exit__ << block
+    block
   end
 
-  # Opal does not support #caller, but we stub it as an empty array to not
-  # break dependant libs
-  def caller(*args)
-    []
+  def caller(start = 1, length = nil)
+    %x{
+      var stack, result
+
+      stack = (new Error().stack || "").split("\n")
+      result = []
+
+      // Skip the initial line ("Error:") and Kernel#caller with i=3
+      for (var i = 3, ii = stack.length; i < ii; i++) {
+        if (!stack[i].match("runtime.js")) {
+          result.push(stack[i].replace(/^ *\w+ +/, ''))
+          if (length && result.length == length) break
+        }
+      }
+      return result
+    }
   end
 
   def class
@@ -196,7 +211,7 @@ module Kernel
       if (status.$$is_boolean) {
         status = status ? 0 : 1;
       } else {
-        status = #{Opal.coerce_to(status, Integer, :to_int)}
+        status = $coerce_to(status, #{Integer}, 'to_int')
       }
 
       Opal.exit(status);
@@ -335,7 +350,7 @@ module Kernel
       if (base === undefined) {
         base = 0;
       } else {
-        base = #{Opal.coerce_to(`base`, Integer, :to_int)};
+        base = $coerce_to(base, #{Integer}, 'to_int');
         if (base === 1 || base < 0 || base > 36) {
           #{raise ArgumentError, "invalid radix #{base}"}
         }
@@ -501,7 +516,15 @@ module Kernel
     $stdout.print(*strs)
   end
 
-  def warn(*strs)
+  def warn(*strs, uplevel: nil)
+    if uplevel
+      uplevel = Opal.coerce_to!(uplevel, Integer, :to_str)
+      raise ArgumentError, "negative level (#{uplevel})" if uplevel < 0
+      location = caller(uplevel + 2, 1).first
+      location = "#{location}: " if location
+      strs = strs.map { |s| "#{location}warning: #{s}" }
+    end
+
     $stderr.puts(*strs) unless $VERBOSE.nil? || strs.empty?
   end
 
@@ -563,23 +586,27 @@ module Kernel
   end
 
   def respond_to?(name, include_all = false)
-    return true if respond_to_missing?(name, include_all)
-
     %x{
       var body = self['$' + name];
 
       if (typeof(body) === "function" && !body.$$stub) {
         return true;
       }
-    }
 
-    false
+      if (self['$respond_to_missing?'].$$pristine === true) {
+        return false;
+      } else {
+        return #{respond_to_missing?(name, include_all)};
+      }
+    }
   end
 
   def respond_to_missing?(method_name, include_all = false)
     false
   end
 
+  Opal.pristine(self, :respond_to?, :respond_to_missing?)
+
   def require(file)
     file = Opal.coerce_to!(file, String, :to_str)
     `Opal.require(#{file})`
@@ -634,7 +661,7 @@ module Kernel
 
       var t = get_time();
       while (get_time() - t <= seconds * 1000);
-      return seconds;
+      return Math.round(seconds);
     }
   end
 
@@ -680,6 +707,10 @@ module Kernel
     return enum_for(:yield_self) { 1 } unless block_given?
     yield self
   end
+
+  alias then yield_self
+
+  Opal.pristine(self, :method_missing)
 end
 
 class Object

data/opal/corelib/kernel/format.rb

@@ -1,3 +1,5 @@
+# helpers: coerce_to
+
 module Kernel
   def format(format_string, *args)
     if args.length == 1 && args[0].respond_to?(:to_ary)
@@ -487,7 +489,7 @@ module Kernel
             if (#{`arg`.respond_to?(:to_str)}) {
               str = #{`arg`.to_str};
             } else {
-              str = String.fromCharCode(#{Opal.coerce_to(`arg`, Integer, :to_int)});
+              str = String.fromCharCode($coerce_to(arg, #{Integer}, 'to_int'));
             }
             if (str.length !== 1) {
               #{raise ArgumentError, '%c requires a character'}

data/opal/corelib/math.rb

@@ -1,3 +1,5 @@
+# helpers: type_error
+
 module Math
   E  = `Math.E`
   PI = `Math.PI`
@@ -23,13 +25,13 @@ module Math
   def self.float!(value)
     Float(value)
   rescue ArgumentError
-    raise Opal.type_error(value, Float)
+    raise `$type_error(value, #{Float})`
   end
 
   def self.integer!(value)
     Integer(value)
   rescue ArgumentError
-    raise Opal.type_error(value, Integer)
+    raise `$type_error(value, #{Integer})`
   end
 
   module_function
@@ -368,14 +370,14 @@ module Math
 
   def log(x, base = undefined)
     if String === x
-      raise Opal.type_error(x, Float)
+      raise `$type_error(x, #{Float})`
     end
 
     if `base == null`
       Math.checked :log, Math.float!(x)
     else
       if String === base
-        raise Opal.type_error(base, Float)
+        raise `$type_error(base, #{Float})`
       end
 
       Math.checked(:log, Math.float!(x)) / Math.checked(:log, Math.float!(base))
@@ -392,7 +394,7 @@ module Math
 
   def log10(x)
     if String === x
-      raise Opal.type_error(x, Float)
+      raise `$type_error(x, #{Float})`
     end
 
     Math.checked :log10, Math.float!(x)
@@ -408,7 +410,7 @@ module Math
 
   def log2(x)
     if String === x
-      raise Opal.type_error(x, Float)
+      raise `$type_error(x, #{Float})`
     end
 
     Math.checked :log2, Math.float!(x)