opal 0.11.4 → 1.0.0.beta1

data/opal/corelib/marshal.rb

@@ -5,20 +5,8 @@ module Marshal
   MAJOR_VERSION = 4
   MINOR_VERSION = 8
 
-  # For simulating binary strings
-  #
-  class BinaryString < String
-    def encoding
-      Encoding::BINARY
-    end
-
-    def +(other)
-      BinaryString.new(super)
-    end
-  end
-
   class << self
-  def dump(object)
+    def dump(object)
       WriteBuffer.new(object).write
     end
 

data/opal/corelib/marshal/read_buffer.rb

@@ -41,7 +41,7 @@ module Marshal
     def read(cache: true)
       code = read_char
       # The first character indicates the type of the object
-      result = case code
+      case code
       when '0'
         nil
       when 'T'
@@ -93,14 +93,13 @@ module Marshal
       when 'd'
         raise NotImplementedError, 'Data type cannot be demarshaled'
       else
-        raise ArgumentError, "dump format error"
+        raise ArgumentError, 'dump format error'
       end
-      result
     end
 
     def read_byte
       if @index >= length
-        raise ArgumentError, "marshal data too short"
+        raise ArgumentError, 'marshal data too short'
       end
       result = @buffer[@index]
       @index += 1
@@ -155,15 +154,15 @@ module Marshal
     #
     def read_float
       s = read_string(cache: false)
-      result = if s == "nan"
-        0.0 / 0
-      elsif s == "inf"
-        1.0 / 0
-      elsif s == "-inf"
-        -1.0 / 0
-      else
-        s.to_f
-      end
+      result = if s == 'nan'
+                 0.0 / 0
+               elsif s == 'inf'
+                 1.0 / 0
+               elsif s == '-inf'
+                 -1.0 / 0
+               else
+                 s.to_f
+               end
       @object_cache << result
       result
     end
@@ -175,7 +174,7 @@ module Marshal
       size = read_fixnum * 2
       result = 0
       (0...size).each do |exp|
-        result += (read_char.ord) * 2 ** (exp * 8)
+        result += read_char.ord * 2**(exp * 8)
       end
       result = result.to_i * sign
       @object_cache << result
@@ -484,10 +483,10 @@ module Marshal
       value = read(cache: false)
 
       result = if klass < Hash
-        klass[value]
-      else
-        klass.new(value)
-      end
+                 klass[value]
+               else
+                 klass.new(value)
+               end
 
       @object_cache << result
 
@@ -555,11 +554,9 @@ module Marshal
     #  re-raises Marshal-specific error when it's missing
     #
     def safe_const_get(const_name)
-      begin
-        Object.const_get(const_name)
-      rescue NameError
-        raise ArgumentError, "undefined class/module #{const_name}"
-      end
+      Object.const_get(const_name)
+    rescue NameError
+      raise ArgumentError, "undefined class/module #{const_name}"
     end
   end
 end

data/opal/corelib/marshal/write_buffer.rb

@@ -14,7 +14,7 @@ class Boolean
   end
 end
 
-class Fixnum
+class Integer
   def __marshal__(buffer)
     if self >= -0x40000000 && self < 0x40000000
       buffer.append('i')
@@ -116,7 +116,7 @@ class Module
     end
 
     buffer.save_link(self)
-    buffer.append("m")
+    buffer.append('m')
     buffer.write_module(self)
   end
 end
@@ -132,7 +132,7 @@ class Class
     end
 
     buffer.save_link(self)
-    buffer.append("c")
+    buffer.append('c')
     buffer.write_class(self)
   end
 end
@@ -141,7 +141,7 @@ class BasicObject
   def __marshal__(buffer)
     buffer.save_link(self)
     buffer.write_extends(self)
-    buffer.append("o")
+    buffer.append('o')
     buffer.write_object(self)
   end
 end
@@ -150,7 +150,7 @@ class Range
   def __marshal__(buffer)
     buffer.save_link(self)
     buffer.write_extends(self)
-    buffer.append("o")
+    buffer.append('o')
     buffer.append_symbol(self.class.name)
     buffer.write_fixnum(3)
     buffer.append_symbol('excl')
@@ -169,7 +169,7 @@ class Struct
     buffer.write_extends(self)
     buffer.append('S')
     buffer.append_symbol(self.class.name)
-    buffer.write_fixnum(self.length)
+    buffer.write_fixnum(length)
     each_pair do |attr_name, value|
       buffer.append_symbol(attr_name)
       buffer.write(value)
@@ -182,9 +182,17 @@ module Marshal
   class WriteBuffer
     attr_reader :buffer
 
+    %x{
+      function binaryString(s) {
+        s = new String(s);
+        s.encoding = #{Encoding::BINARY};
+        return s;
+      }
+    }
+
     def initialize(object)
       @object = object
-      @buffer = BinaryString.new
+      @buffer = ''
       @cache = []
       @extends = Hash.new { |h, k| h[k] = [] }
       append(version)
@@ -202,7 +210,7 @@ module Marshal
         when nil, true, false, Proc, Method, MatchData, Range, Struct, Array, Class, Module, Hash, Regexp
           object.__marshal__(self)
         when Integer
-          Fixnum.instance_method(:__marshal__).bind(object).call(self)
+          Integer.instance_method(:__marshal__).bind(object).call(self)
         when Float
           Float.instance_method(:__marshal__).bind(object).call(self)
         when String
@@ -212,7 +220,7 @@ module Marshal
         end
       end
 
-      @buffer
+      `binaryString(#{@buffer})`
     end
 
     def write_fixnum(n)
@@ -265,7 +273,7 @@ module Marshal
 
       arr.each do |x|
         append(`String.fromCharCode(x & 0xff)`)
-        append(`String.fromCharCode(#{(x/0x100).floor})`)
+        append(`String.fromCharCode(#{(x / 0x100).floor})`)
       end
     end
 
@@ -326,7 +334,7 @@ module Marshal
     end
 
     def write_ivars_suffix(object, force = false)
-      if object.instance_variables.length == 0 && !force
+      if object.instance_variables.empty? && !force
         return
       end
 
@@ -341,7 +349,7 @@ module Marshal
       singleton_mods = object.singleton_class.ancestors.reject { |mod| mod.is_a?(Class) }
       class_mods = object.class.ancestors.reject { |mod| mod.is_a?(Class) }
       own_mods = singleton_mods - class_mods
-      if own_mods.length > 0
+      unless own_mods.empty?
         own_mods.each do |mod|
           append('e')
           append_symbol(mod.name)
@@ -382,7 +390,7 @@ module Marshal
       value = object._dump(0)
 
       unless value.is_a?(String)
-        raise TypeError, "_dump() must return string"
+        raise TypeError, '_dump() must return string'
       end
 
       write_ivars_prefix(value)
@@ -392,13 +400,13 @@ module Marshal
     end
 
     def write_ivars_prefix(object)
-      if object.instance_variables.length > 0
+      unless object.instance_variables.empty?
         append('I')
       end
     end
 
     def append(s)
-      @buffer += s
+      `#{@buffer} += #{s}`
     end
 
     def version

data/opal/corelib/math.rb

@@ -21,19 +21,15 @@ module Math
   end
 
   def self.float!(value)
-    begin
-      Float(value)
-    rescue ArgumentError
-      raise Opal.type_error(value, Float)
-    end
+    Float(value)
+  rescue ArgumentError
+    raise Opal.type_error(value, Float)
   end
 
   def self.integer!(value)
-    begin
-      Integer(value)
-    rescue ArgumentError
-      raise Opal.type_error(value, Integer)
-    end
+    Integer(value)
+  rescue ArgumentError
+    raise Opal.type_error(value, Integer)
   end
 
   module_function
@@ -158,7 +154,7 @@ module Math
 
   unless defined?(`Math.erf`)
     %x{
-      Math.erf = function(x) {
+      Opal.defineProperty(Math, 'erf', function(x) {
         var A1 =  0.254829592,
             A2 = -0.284496736,
             A3 =  1.421413741,
@@ -178,7 +174,7 @@ module Math
         var y = 1.0 - (((((A5 * t + A4) * t) + A3) * t + A2) * t + A1) * t * Math.exp(-x * x);
 
         return sign * y;
-      }
+      });
     }
   end
 
@@ -188,7 +184,7 @@ module Math
 
   unless defined?(`Math.erfc`)
     %x{
-      Math.erfc = function(x) {
+      Opal.defineProperty(Math, 'erfc', function(x) {
         var z = Math.abs(x),
             t = 1.0 / (0.5 * z + 1.0);
 
@@ -211,7 +207,7 @@ module Math
         else {
           return a;
         }
-      }
+      });
     }
   end
 
@@ -274,7 +270,7 @@ module Math
       }
 
       if (n === -1 || n === -Infinity) {
-        #{raise DomainError, "Numerical argument is out of domain - \"gamma\""};
+        #{raise DomainError, 'Numerical argument is out of domain - "gamma"'};
       }
 
       if (#{Integer === n}) {
@@ -352,7 +348,7 @@ module Math
 
     %x{
       if (isNaN(exponent)) {
-        #{raise RangeError, "float NaN out of range of integer"};
+        #{raise RangeError, 'float NaN out of range of integer'};
       }
 
       return mantissa * Math.pow(2, exponent);

data/opal/corelib/method.rb

@@ -26,9 +26,9 @@ class Method
 
   def call(*args, &block)
     %x{
-      #@method.$$p = block;
+      #{@method}.$$p = block;
 
-      return #@method.apply(#@receiver, args);
+      return #{@method}.apply(#{@receiver}, args);
     }
   end
 
@@ -41,8 +41,10 @@ class Method
   def to_proc
     %x{
       var proc = self.$call.bind(self);
-      proc.$$unbound = #@method;
+      proc.$$unbound = #{@method};
       proc.$$is_lambda = true;
+      proc.$$arity = #{@method}.$$arity;
+      proc.$$parameters = #{@method}.$$parameters;
       return proc;
     }
   end

data/opal/corelib/module.rb

@@ -1,15 +1,15 @@
 class Module
   def self.allocate
     %x{
-      var module;
-
-      module = Opal.module_allocate(self);
+      var module = Opal.allocate_module(nil, function(){});
+      // Link the prototype of Module subclasses
+      if (self !== Opal.Module) Object.setPrototypeOf(module, self.$$prototype);
       return module;
     }
   end
 
   def initialize(&block)
-    `Opal.module_initialize(self, block)`
+    module_eval(&block) if block_given?
   end
 
   def ===(object)
@@ -20,7 +20,7 @@ class Module
 
   def <(other)
     unless Module === other
-      raise TypeError, "compared with non class/module"
+      raise TypeError, 'compared with non class/module'
     end
 
     # class cannot be a descendant of itself
@@ -55,7 +55,7 @@ class Module
 
   def >(other)
     unless Module === other
-      raise TypeError, "compared with non class/module"
+      raise TypeError, 'compared with non class/module'
     end
 
     other < self
@@ -111,7 +111,7 @@ class Module
 
   def attr_reader(*names)
     %x{
-      var proto = self.$$proto;
+      var proto = self.$$prototype;
 
       for (var i = names.length - 1; i >= 0; i--) {
         var name = names[i],
@@ -132,17 +132,12 @@ class Module
         })(ivar);
 
         // initialize the instance variable as nil
-        proto[ivar] = nil;
+        Opal.defineProperty(proto, ivar, nil);
 
         body.$$parameters = [];
         body.$$arity = 0;
 
-        if (self.$$is_singleton) {
-          proto.constructor.prototype[id] = body;
-        }
-        else {
-          Opal.defn(self, id, body);
-        }
+        Opal.defn(self, id, body);
       }
     }
 
@@ -151,7 +146,7 @@ class Module
 
   def attr_writer(*names)
     %x{
-      var proto = self.$$proto;
+      var proto = self.$$prototype;
 
       for (var i = names.length - 1; i >= 0; i--) {
         var name = names[i],
@@ -170,14 +165,9 @@ class Module
         body.$$arity = 1;
 
         // initialize the instance variable as nil
-        proto[ivar] = nil;
+        Opal.defineProperty(proto, ivar, nil);
 
-        if (self.$$is_singleton) {
-          proto.constructor.prototype[id] = body;
-        }
-        else {
-          Opal.defn(self, id, body);
-        }
+        Opal.defn(self, id, body);
       }
     }
 
@@ -229,16 +219,16 @@ class Module
         delete self.$$cvars[name];
         return value;
       } else {
-        #{raise NameError.new("cannot remove #{name} for #{self}")}
+        #{raise NameError, "cannot remove #{name} for #{self}"}
       }
     }
   end
 
-  def constants(inherit=true)
+  def constants(inherit = true)
     `Opal.constants(self, inherit)`
   end
 
-  def self.constants(inherit=undefined)
+  def self.constants(inherit = undefined)
     %x{
       if (inherit == null) {
         var nesting = (self.$$nesting || []).concat(Opal.Object),
@@ -309,7 +299,7 @@ class Module
 
     %x{
       if (inherit) {
-        return Opal.const_get_relative([self], name);
+        return $$([self], name);
       } else {
         return Opal.const_get_local(self, name);
       }
@@ -337,7 +327,7 @@ class Module
   def const_set(name, value)
     name = Opal.const_name!(name)
 
-    if !(name =~ Opal::CONST_NAME_REGEXP) || name.start_with?('::')
+    if name !~ Opal::CONST_NAME_REGEXP || name.start_with?('::')
       raise NameError.new("wrong constant name #{name}", name)
     end
 
@@ -351,25 +341,25 @@ class Module
 
   def define_method(name, method = undefined, &block)
     if `method === undefined && block === nil`
-      raise ArgumentError, "tried to create a Proc object without a block"
+      raise ArgumentError, 'tried to create a Proc object without a block'
     end
 
     block ||= case method
-      when Proc
-        method
+              when Proc
+                method
 
-      when Method
-        `#{method.to_proc}.$$unbound`
+              when Method
+                `#{method.to_proc}.$$unbound`
 
-      when UnboundMethod
-        lambda {|*args|
-          bound = method.bind(self)
-          bound.call(*args)
-        }
+              when UnboundMethod
+                ->(*args) {
+                  bound = method.bind(self)
+                  bound.call(*args)
+                }
 
-      else
-        raise TypeError, "wrong argument type #{block.class} (expected Proc/Method)"
-    end
+              else
+                raise TypeError, "wrong argument type #{block.class} (expected Proc/Method)"
+              end
 
     %x{
       var id = '$' + name;
@@ -417,32 +407,7 @@ class Module
   end
 
   def included_modules
-    %x{
-      var results;
-
-      var module_chain = function(klass) {
-        var included = [];
-
-        for (var i = 0, ii = klass.$$inc.length; i < ii; i++) {
-          var mod_or_class = klass.$$inc[i];
-          included.push(mod_or_class);
-          included = included.concat(module_chain(mod_or_class));
-        }
-
-        return included;
-      };
-
-      results = module_chain(self);
-
-      // need superclass's modules
-      if (self.$$is_class) {
-        for (var cls = self; cls; cls = cls.$$super) {
-          results = results.concat(module_chain(cls));
-        }
-      }
-
-      return results;
-    }
+    `Opal.included_modules(self)`
   end
 
   def include?(mod)
@@ -466,7 +431,7 @@ class Module
 
   def instance_method(name)
     %x{
-      var meth = self.$$proto['$' + name];
+      var meth = self.$$prototype['$' + name];
 
       if (!meth || meth.$$stub) {
         #{raise NameError.new("undefined method `#{name}' for class `#{self.name}'", name)};
@@ -478,43 +443,11 @@ class Module
 
   def instance_methods(include_super = true)
     %x{
-      var value,
-          methods = [],
-          proto   = self.$$proto;
-
-      for (var prop in proto) {
-        if (prop.charAt(0) !== '$' || prop.charAt(1) === '$') {
-          continue;
-        }
-
-        value = proto[prop];
-
-        if (typeof(value) !== "function") {
-          continue;
-        }
-
-        if (value.$$stub) {
-          continue;
-        }
-
-        if (!self.$$is_module) {
-          if (self !== Opal.BasicObject && value === Opal.BasicObject.$$proto[prop]) {
-            continue;
-          }
-
-          if (!include_super && !proto.hasOwnProperty(prop)) {
-            continue;
-          }
-
-          if (!include_super && value.$$donated) {
-            continue;
-          }
-        }
-
-        methods.push(prop.substr(1));
+      if (#{Opal.truthy?(include_super)}) {
+        return Opal.instance_methods(self);
+      } else {
+        return Opal.own_instance_methods(self);
       }
-
-      return methods;
     }
   end
 
@@ -524,6 +457,9 @@ class Module
   def extended(mod)
   end
 
+  def extend_object(object)
+  end
+
   def method_added(*)
   end
 
@@ -535,7 +471,7 @@ class Module
 
   def module_eval(*args, &block)
     if block.nil? && `!!Opal.compile`
-      Kernel.raise ArgumentError, "wrong number of arguments (0 for 1..3)" unless (1..3).cover? args.size
+      Kernel.raise ArgumentError, 'wrong number of arguments (0 for 1..3)' unless (1..3).cover? args.size
 
       string, file, _lineno = *args
       default_eval_options = { file: (file || '(eval)'), eval: true }
@@ -548,9 +484,9 @@ class Module
           })(self)
         }
       end
-    elsif args.size > 0
-      Kernel.raise ArgumentError, "wrong number of arguments (#{args.size} for 0)"+
-        "\n\n  NOTE:If you want to enable passing a String argument please add \"require 'opal-parser'\" to your script\n"
+    elsif args.any?
+      Kernel.raise ArgumentError, "wrong number of arguments (#{args.size} for 0)" \
+                                  "\n\n  NOTE:If you want to enable passing a String argument please add \"require 'opal-parser'\" to your script\n"
     end
 
     %x{
@@ -587,7 +523,7 @@ class Module
 
   def method_defined?(method)
     %x{
-      var body = self.$$proto['$' + method];
+      var body = self.$$prototype['$' + method];
       return (!!body) && !body.$$stub;
     }
   end
@@ -601,7 +537,7 @@ class Module
         for (var i = 0, length = methods.length; i < length; i++) {
           var meth = methods[i],
               id   = '$' + meth,
-              func = self.$$proto[id];
+              func = self.$$prototype[id];
 
           Opal.defs(self, id, func);
         }
@@ -640,6 +576,41 @@ class Module
     }
   end
 
+  def prepend(*mods)
+    %x{
+      if (mods.length === 0) {
+        #{raise ArgumentError, 'wrong number of arguments (given 0, expected 1+)'}
+      }
+
+      for (var i = mods.length - 1; i >= 0; i--) {
+        var mod = mods[i];
+
+        if (!mod.$$is_module) {
+          #{raise TypeError, "wrong argument type #{`mod`.class} (expected Module)"};
+        }
+
+        #{`mod`.prepend_features self};
+        #{`mod`.prepended self};
+      }
+    }
+
+    self
+  end
+
+  def prepend_features(prepender)
+    %x{
+      if (!self.$$is_module) {
+        #{raise TypeError, "wrong argument type #{self.class} (expected Module)"};
+      }
+
+      Opal.prepend_features(self, prepender)
+    }
+    self
+  end
+
+  def prepended(mod)
+  end
+
   def remove_const(name)
     `Opal.const_remove(self, name)`
   end