opal 0.5.5 → 0.6.0

data/opal/corelib/io.rb

@@ -42,32 +42,15 @@ STDERR = $stderr = IO.new
 STDIN  = $stdin  = IO.new
 STDOUT = $stdout = IO.new
 
-def $stdout.puts(*strs)
-  %x{
-    for (var i = 0; i < strs.length; i++) {
-      if (strs[i] instanceof Array) {
-        #{puts(*`strs[i]`)};
-      }
-      else {
-        console.log(#{`strs[i]`.to_s});
-      }
-    }
-  }
-
+def $stdout.write(string)
+  `console.log(#{string.to_s});`
   nil
 end
 
-def $stderr.puts(*strs)
-  %x{
-    for (var i = 0; i < strs.length; i++) {
-      if (strs[i] instanceof Array) {
-        #{puts(*`strs[i]`)};
-      }
-      else {
-        console.warn(#{`strs[i]`.to_s});
-      }
-    }
-  }
-
+def $stderr.write(string)
+  `console.warn(#{string.to_s});`
   nil
 end
+
+$stdout.extend(IO::Writable)
+$stderr.extend(IO::Writable)

data/opal/corelib/kernel.rb

@@ -104,7 +104,6 @@ module Kernel
   def initialize_clone(other)
     initialize_copy(other)
   end
-  private :initialize_clone
 
   def define_singleton_method(name, &body)
     unless body
@@ -135,7 +134,6 @@ module Kernel
   def initialize_dup(other)
     initialize_copy(other)
   end
-  private :initialize_dup
 
   def enum_for(method = :each, *args, &block)
     Enumerator.for(self, method, *args, &block)
@@ -147,18 +145,23 @@ module Kernel
 
   def extend(*mods)
     %x{
-      for (var i = 0, length = mods.length; i < length; i++) {
-        #{ self.singleton_class.include `mods[i]` };
-      }
+      var singleton = #{singleton_class};
 
-      return self;
+      for (var i = mods.length - 1; i >= 0; i--) {
+        var mod = mods[i];
+
+        #{`mod`.append_features `singleton`};
+        #{`mod`.extended self};
+      }
     }
+
+    self
   end
 
   def format(format, *args)
     %x{
       var idx = 0;
-      return format.replace(/%(\\d+\\$)?([-+ 0]*)(\\d*|\\*(\\d+\\$)?)(?:\\.(\\d*|\\*(\\d+\\$)?))?([cspdiubBoxXfgeEG])|(%%)/g, function(str, idx_str, flags, width_str, w_idx_str, prec_str, p_idx_str, spec, escaped) {
+      return format.replace(/%(\d+\$)?([-+ 0]*)(\d*|\*(\d+\$)?)(?:\.(\d*|\*(\d+\$)?))?([cspdiubBoxXfgeEG])|(%%)/g, function(str, idx_str, flags, width_str, w_idx_str, prec_str, p_idx_str, spec, escaped) {
         if (escaped) {
           return '%';
         }
@@ -300,7 +303,7 @@ module Kernel
   end
 
   def instance_variable_defined?(name)
-    `self.hasOwnProperty(name.substr(1))`
+    `$opal.hasOwnProperty.call(self, name.substr(1))`
   end
 
   def instance_variable_get(name)
@@ -440,7 +443,9 @@ module Kernel
     args.length <= 1 ? args[0] : args
   end
 
-  alias print puts
+  def print(*strs)
+    $stdout.print(*strs)
+  end
 
   def warn(*strs)
     $stderr.puts(*strs) unless $VERBOSE.nil? || strs.empty?
@@ -485,10 +490,17 @@ module Kernel
   alias srand rand
 
   def respond_to?(name, include_all = false)
+    return true if respond_to_missing?(name)
+
     %x{
       var body = self['$' + name];
-      return (!!body) && !body.rb_stub;
+
+      if (typeof(body) === "function" && !body.rb_stub) {
+        return true;
+      }
     }
+
+    false
   end
 
   alias send        __send__
@@ -571,7 +583,7 @@ module Kernel
     @___frozen___ || false
   end
 
-  def respond_to_missing? method_name
+  def respond_to_missing?(method_name)
     false
   end
 end

data/opal/corelib/module.rb

@@ -137,7 +137,7 @@ 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;
@@ -159,7 +159,7 @@ 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;
@@ -180,12 +180,8 @@ class Module
 
   alias attr attr_accessor
 
-  # when self is Module (or Class), implement 1st form:
-  # - global constants, classes and modules in global scope
-  # when self is not Module (or Class), implement 2nd form:
-  # - constants, classes and modules scoped to instance
   def constants
-    `#{self}._scope.constants`
+    `self._scope.constants`
   end
 
   # check for constant within current scope
@@ -194,9 +190,9 @@ class Module
     raise NameError, "wrong constant name #{name}" unless name =~ /^[A-Z]\w*$/
 
     %x{
-      scopes = [#{self}._scope];
-      if (inherit || #{self} === Opal.Object) {
-        var parent = #{self}._super;
+      scopes = [self._scope];
+      if (inherit || self === Opal.Object) {
+        var parent = self._super;
         while (parent !== Opal.BasicObject) {
           scopes.push(parent._scope);
           parent = parent._super;
@@ -213,15 +209,13 @@ class Module
     }
   end
 
-  # check for constant within current scope
-  # if inherit is true or self is Object, will also check ancestors
   def const_get(name, inherit = true)
     raise NameError, "wrong constant name #{name}" unless name =~ /^[A-Z]\w*$/
 
     %x{
-      var scopes = [#{self}._scope];
-      if (inherit || #{self} == Opal.Object) {
-        var parent = #{self}._super;
+      var scopes = [self._scope];
+      if (inherit || self == Opal.Object) {
+        var parent = self._super;
         while (parent !== Opal.BasicObject) {
           scopes.push(parent._scope);
           parent = parent._super;
@@ -239,7 +233,7 @@ class Module
   end
 
   def const_missing(const)
-    name = `#{self}._name`
+    name = `self._name`
 
     raise NameError, "uninitialized constant #{name}::#{const}"
   end
@@ -274,8 +268,8 @@ class Module
       block._s    = null;
       block._def  = block;
 
-      #{self}._proto[jsid] = block;
-      $opal.donate(#{self}, [jsid]);
+      self._proto[jsid] = block;
+      $opal.donate(self, [jsid]);
 
       return null;
     }
@@ -284,32 +278,30 @@ 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]);
-      return #{self};
+      // $opal.retire(self, [jsid]);
+      return self;
     }
   end
 
   def include(*mods)
     %x{
-      var i = mods.length - 1, mod;
-      while (i >= 0) {
-        mod = mods[i];
-        i--;
+      for (var i = mods.length - 1; i >= 0; i--) {
+        var mod = mods[i];
 
-        if (mod === #{self}) {
+        if (mod === self) {
           continue;
         }
 
-        #{ `mod`.append_features self };
-        #{ `mod`.included self };
+        #{`mod`.append_features self};
+        #{`mod`.included self};
       }
-
-      return #{self};
     }
+
+    self
   end
 
   def instance_method(name)
@@ -326,9 +318,9 @@ 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;
         }
@@ -349,17 +341,19 @@ class Module
   def included(mod)
   end
 
+  def extended(mod)
+  end
+
   def module_eval(&block)
-    %x{
-      if (block === nil) {
-        throw new Error("no block given");
-      }
+    raise ArgumentError, 'no block given' unless block
 
-      var block_self = block._s, result;
+    %x{
+      var old = block._s,
+          result;
 
       block._s = null;
-      result = block.call(#{self});
-      block._s = block_self;
+      result = block.call(self);
+      block._s = old;
 
       return result;
     }
@@ -387,7 +381,7 @@ class Module
 
   def method_defined?(method)
     %x{
-      var body = #{self}._proto['$' + method];
+      var body = self._proto['$' + method];
       return (!!body) && !body.rb_stub;
     }
   end
@@ -395,12 +389,12 @@ class Module
   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;
+        self.constructor.prototype['$' + meth] = func;
       }
 
-      return #{self};
+      return self;
     }
   end
 
@@ -448,6 +442,9 @@ class Module
     false
   end
 
+  def private_constant(*)
+  end
+
   alias protected_method_defined? private_method_defined?
 
   alias public_instance_methods instance_methods
@@ -459,8 +456,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
@@ -470,7 +467,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

data/opal/corelib/nil_class.rb

@@ -1,4 +1,8 @@
 class NilClass
+  def !
+    true
+  end
+
   def &(other)
     false
   end

data/opal/corelib/numeric.rb

@@ -1,12 +1,10 @@
+require 'corelib/comparable'
+
 class Numeric
   include Comparable
 
   `def._isNumber = true`
 
-  class << self
-    undef_method :new
-  end
-
   def coerce(other, type = :operation)
     %x{
       if (other._isNumber) {
@@ -197,6 +195,14 @@ class Numeric
     `self >> #{count.to_int}`
   end
 
+  def [](bit)
+    bit = Opal.coerce_to! bit, Integer, :to_int
+    min = -(2**30)
+    max =  (2**30) - 1
+
+    `(#{bit} < #{min} || #{bit} > #{max}) ? 0 : (self >> #{bit}) % 2`
+  end
+
   def +@
     `+self`
   end
@@ -277,6 +283,30 @@ class Numeric
     `Math.floor(self)`
   end
 
+  def gcd(other)
+    unless Integer === other
+      raise TypeError, 'not an integer'
+    end
+
+    %x{
+      var min = Math.abs(self),
+          max = Math.abs(other);
+
+      while (min > 0) {
+        var tmp = min;
+
+        min = max % min;
+        max = tmp;
+      }
+
+      return max;
+    }
+  end
+
+  def gcdlcm(other)
+    [gcd, lcm]
+  end
+
   def hash
     `self.toString()`
   end
@@ -286,12 +316,38 @@ class Numeric
   end
 
   def is_a?(klass)
+    return true if klass == Fixnum && Integer === self
+    return true if klass == Integer && Integer === self
     return true if klass == Float && Float === self
+
+    super
+  end
+
+  alias kind_of? is_a?
+
+  def instance_of?(klass)
+    return true if klass == Fixnum && Integer === self
     return true if klass == Integer && Integer === self
+    return true if klass == Float && Float === self
 
     super
   end
 
+  def lcm(other)
+    unless Integer === other
+      raise TypeError, 'not an integer'
+    end
+
+    %x{
+      if (self == 0 || other == 0) {
+        return 0;
+      }
+      else {
+        return Math.abs(self * other / #{gcd(other)});
+      }
+    }
+  end
+
   alias magnitude abs
 
   alias modulo %
@@ -316,6 +372,10 @@ class Numeric
     `self - 1`
   end
 
+  def round
+    `Math.round(self)`
+  end
+
   def step(limit, step = 1, &block)
     return enum_for :step, limit, step unless block
 
@@ -358,11 +418,11 @@ class Numeric
   end
 
   def to_f
-    `parseFloat(#{self})`
+    self
   end
 
   def to_i
-    `parseInt(#{self})`
+    `parseInt(self)`
   end
 
   alias to_int to_i
@@ -402,8 +462,8 @@ class Numeric
     `self == 0`
   end
 
+  # Since bitwise operations are 32 bit, declare it to be so.
   def size
-    # Just a stub, JS is 32bit for bitwise ops though
     4
   end
 
@@ -412,15 +472,29 @@ class Numeric
   end
 
   def finite?
-    `self == Infinity || self == -Infinity`
+    `self != Infinity && self != -Infinity`
   end
 
   def infinite?
-    if `self == Infinity`
-      `+1`
-    elsif `self == -Infinity`
-      `-1`
-    end
+    %x{
+      if (self == Infinity) {
+        return +1;
+      }
+      else if (self == -Infinity) {
+        return -1;
+      }
+      else {
+        return nil;
+      }
+    }
+  end
+
+  def positive?
+    `1 / self > 0`
+  end
+
+  def negative?
+    `1 / self < 0`
   end
 end
 
@@ -428,15 +502,27 @@ Fixnum = Numeric
 
 class Integer < Numeric
   def self.===(other)
-    `!!(other._isNumber && (other % 1) == 0)`
+    %x{
+      if (!other._isNumber) {
+        return false;
+      }
+
+      return (other % 1) === 0;
+    }
   end
 end
 
 class Float < Numeric
   def self.===(other)
-    `!!(other._isNumber && (other % 1) != 0)`
+    `!!other._isNumber`
   end
 
   INFINITY = `Infinity`
   NAN      = `NaN`
+
+  if defined?(`Number.EPSILON`)
+    EPSILON = `Number.EPSILON`
+  else
+    EPSILON = `2.2204460492503130808472633361816E-16`
+  end
 end