opal 0.5.0 → 0.5.2

data/{corelib → opal/core}/io.rb

@@ -38,32 +38,36 @@ class IO
   end
 end
 
-STDERR        = $stderr = IO.new
-STDIN         = $stdin  = IO.new
-STDOUT        = $stdout = IO.new
+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 {
+      if (strs[i] instanceof Array) {
+        #{puts(*`strs[i]`)};
+      }
+      else {
         console.log(#{`strs[i]`.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 {
+      if (strs[i] instanceof Array) {
+        #{puts(*`strs[i]`)};
+      }
+      else {
         console.warn(#{`strs[i]`.to_s});
       }
     }
   }
+
   nil
 end

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

@@ -36,16 +36,19 @@ module Kernel
   def methods(all = true)
     %x{
       var methods = [];
-      for(var k in self) {
-        if(k[0] == "$" && typeof (self)[k] === "function") {
-          if(all === #{false} || all === #{nil}) {
-            if(!Object.hasOwnProperty.call(self, k)) {
+
+      for (var key in self) {
+        if (key[0] == "$" && typeof(self[key]) === "function") {
+          if (all == false || all === nil) {
+            if (!$opal.hasOwnProperty.call(self, key)) {
               continue;
             }
           }
-          methods.push(k.substr(1));
+
+          methods.push(key.substr(1));
         }
       }
+
       return methods;
     }
   end
@@ -55,9 +58,6 @@ module Kernel
       if (object == null || object === nil) {
         return [];
       }
-      else if (#{native?(object)}) {
-        return #{Native::Array.new(object, *args, &block).to_a};
-      }
       else if (#{object.respond_to? :to_ary}) {
         return #{object.to_ary};
       }
@@ -80,18 +80,44 @@ module Kernel
     `self._klass`
   end
 
-  def define_singleton_method(name, &body)
+  def copy_instance_variables(other)
     %x{
-      if (body === nil) {
-        throw new Error("no block given");
+      for (var name in other) {
+        if (name.charAt(0) !== '$') {
+          if (name !== '_id' && name !== '_klass') {
+            self[name] = other[name];
+          }
+        }
       }
+    }
+  end
+
+  def clone
+    copy = self.class.allocate
 
+    copy.copy_instance_variables(self)
+    copy.initialize_clone(self)
+
+    copy
+  end
+
+  def initialize_clone(other)
+    initialize_copy(other)
+  end
+  private :initialize_clone
+
+  def define_singleton_method(name, &body)
+    unless body
+      raise ArgumentError, "tried to create Proc object without a block"
+    end
+
+    %x{
       var jsid   = '$' + name;
       body._jsid = name;
       body._s    = null;
       body._def  = body;
 
-      #{self.singleton_class}._proto[jsid] = body;
+      #{singleton_class}._proto[jsid] = body;
 
       return self;
     }
@@ -100,22 +126,19 @@ module Kernel
   def dup
     copy = self.class.allocate
 
-    %x{
-      for (var name in self) {
-        if (name.charAt(0) !== '$') {
-          if (name !== '_id' && name !== '_klass') {
-            copy[name] = self[name];
-          }
-        }
-      }
-    }
+    copy.copy_instance_variables(self)
+    copy.initialize_dup(self)
 
-    copy.initialize_copy self
     copy
   end
 
-  def enum_for(method = :each, *args)
-    Enumerator.new self, method, *args
+  def initialize_dup(other)
+    initialize_copy(other)
+  end
+  private :initialize_dup
+
+  def enum_for(method = :each, *args, &block)
+    Enumerator.for(self, method, *args, &block)
   end
 
   def equal?(other)
@@ -369,9 +392,13 @@ module Kernel
   end
 
   def loop(&block)
-    `while (true) {`
-      yield
-    `}`
+    %x{
+      while (true) {
+        if (block() === $breaker) {
+          return $breaker.$v;
+        }
+      }
+    }
 
     self
   end
@@ -380,15 +407,13 @@ module Kernel
     false
   end
 
-  def object_id
-    `self._id || (self._id = Opal.uid())`
-  end
+  alias object_id __id__
 
   def printf(*args)
     if args.length > 0
-      fmt = args.shift
-      print format(fmt, *args)
+      print format(*args)
     end
+
     nil
   end
 
@@ -397,13 +422,12 @@ module Kernel
   end
 
   def proc(&block)
-    %x{
-      if (block === nil) {
-        #{ raise ArgumentError, 'no block given' };
-      }
-      block.is_lambda = false;
-      return block;
-    }
+    unless block
+      raise ArgumentError, "tried to create Proc object without a block"
+    end
+
+    `block.is_lambda = false`
+    block
   end
 
   def puts(*strs)
@@ -428,7 +452,7 @@ module Kernel
       if (exception == null && #$!) {
         exception = #$!;
       }
-      else if (typeof(exception) === 'string') {
+      else if (exception._isString) {
         exception = #{RuntimeError.new exception};
       }
       else if (!#{exception.is_a? Exception}) {
@@ -443,15 +467,17 @@ module Kernel
 
   def rand(max = undefined)
     %x{
-      if(!max) {
+      if (max === undefined) {
         return Math.random();
-      } else {
-        if (max._isRange) {
-          var arr = max.$to_a();
-          return arr[#{rand(`arr.length`)}];
-        } else {
-          return Math.floor(Math.random() * Math.abs(parseInt(max)));
-        }
+      }
+      else if (max._isRange) {
+        var arr = #{max.to_a};
+
+        return arr[#{rand(`arr.length`)}];
+      }
+      else {
+        return Math.floor(Math.random() *
+          Math.abs(#{Opal.coerce_to max, Integer, :to_int}));
       }
     }
   end
@@ -533,7 +559,7 @@ module Kernel
   end
 
   def to_s
-    `"#<" + self._klass._name + ":" + self._id + ">"`
+    `"#<" + #{self.class.name} + ":" + self._id + ">"`
   end
 
   def freeze

data/{corelib → opal/core}/match_data.rb

@@ -85,10 +85,6 @@ class MatchData
     `#@matches[0]`
   end
 
-  def to_n
-    @matches
-  end
-
   def values_at(*indexes)
     %x{
       var values       = [],

data/{corelib → opal/core}/module.rb

@@ -366,8 +366,24 @@ class Module
   end
 
   alias class_eval module_eval
-  alias class_exec module_eval
-  alias module_exec module_eval
+
+  def module_exec(&block)
+    %x{
+      if (block === nil) {
+        throw new Error("no block given");
+      }
+
+      var block_self = block._s, result;
+
+      block._s = null;
+      result = block.apply(self, $slice.call(arguments));
+      block._s = block_self;
+
+      return result;
+    }
+  end
+
+  alias class_exec module_exec
 
   def method_defined?(method)
     %x{
@@ -428,12 +444,17 @@ class Module
   alias private public
   alias protected public
 
+  def private_method_defined?(obj)
+    false
+  end
+
+  alias protected_method_defined? private_method_defined?
+
   alias public_instance_methods instance_methods
 
   alias public_method_defined? method_defined?
 
   def remove_class_variable(*)
-
   end
 
   def remove_const(name)

data/{corelib → opal/core}/nil_class.rb

@@ -45,10 +45,6 @@ class NilClass
 
   alias to_f to_i
 
-  def to_n
-    `null`
-  end
-
   def to_s
     ''
   end

data/{corelib → opal/core}/numeric.rb

@@ -384,10 +384,6 @@ class Numeric
     [q, r]
   end
 
-  def to_n
-    `self.valueOf()`
-  end
-
   def upto(finish, &block)
     return enum_for :upto, finish unless block
 
@@ -440,4 +436,7 @@ class Float < Numeric
   def self.===(other)
     `!!(other._isNumber && (other % 1) != 0)`
   end
+
+  INFINITY = `Infinity`
+  NAN      = `NaN`
 end

data/{corelib → opal/core}/proc.rb

@@ -49,8 +49,4 @@ class Proc
   def arity
     `self.length`
   end
-
-  def to_n
-    self
-  end
 end

data/{corelib → opal/core}/regexp.rb

@@ -117,8 +117,4 @@ class Regexp
   end
 
   alias to_s source
-
-  def to_n
-    `self.valueOf()`
-  end
 end

data/{corelib → opal/core}/string.rb

@@ -267,7 +267,7 @@ class String
   def end_with?(*suffixes)
     %x{
       for (var i = 0, length = suffixes.length; i < length; i++) {
-        var suffix = suffixes[i];
+        var suffix = #{Opal.coerce_to `suffixes[i]`, String, :to_str};
 
         if (self.length >= suffix.length && self.substr(0 - suffix.length) === suffix) {
           return true;
@@ -563,7 +563,9 @@ class String
   def start_with?(*prefixes)
     %x{
       for (var i = 0, length = prefixes.length; i < length; i++) {
-        if (#{self}.indexOf(prefixes[i]) === 0) {
+        var prefix = #{Opal.coerce_to `prefixes[i]`, String, :to_str};
+
+        if (self.indexOf(prefix) === 0) {
           return true;
         }
       }
@@ -713,10 +715,6 @@ class String
 
   alias to_sym intern
 
-  def to_n
-    `#{self}.valueOf()`
-  end
-
   def tr(from, to)
     %x{
       if (from.length == 0 || from === to) {

data/{corelib → opal/core}/struct.rb

@@ -52,17 +52,9 @@ class Struct
   include Enumerable
 
   def initialize(*args)
-    if args.length == 1 && native?(args[0])
-      object = args[0]
-
-      members.each {|name|
-        instance_variable_set "@#{name}", Native(`#{object}[#{name}]`)
-      }
-    else
-      members.each_with_index {|name, index|
-        instance_variable_set "@#{name}", args[index]
-      }
-    end
+    members.each_with_index {|name, index|
+      instance_variable_set "@#{name}", args[index]
+    }
   end
 
   def members
@@ -123,16 +115,6 @@ class Struct
 
   alias values to_a
 
-  def to_n
-    result = `{}`
-
-    each_pair {|name, value|
-      `#{result}[#{name}] = #{value.to_n}`
-    }
-
-    result
-  end
-
   def inspect
     result = "#<struct "
 

data/{corelib → opal/core}/time.rb

@@ -508,10 +508,6 @@ class Time
   def year
     `self.getFullYear()`
   end
-
-  def to_n
-    self
-  end
 end
 
 # FIXME: move this to stdlib when the corelib has its own path