opal 1.3.2 → 1.4.0.alpha1

data/opal/corelib/marshal/write_buffer.rb

@@ -1,12 +1,12 @@
-class NilClass
+class ::NilClass
   def __marshal__(buffer)
     buffer.append('0')
   end
 end
 
-class Boolean
+class ::Boolean
   def __marshal__(buffer)
-    if `self`
+    if `self == true`
       buffer.append('T')
     else
       buffer.append('F')
@@ -14,7 +14,7 @@ class Boolean
   end
 end
 
-class Integer
+class ::Integer
   def __marshal__(buffer)
     if self >= -0x40000000 && self < 0x40000000
       buffer.append('i')
@@ -26,7 +26,7 @@ class Integer
   end
 end
 
-class Float
+class ::Float
   def __marshal__(buffer)
     buffer.save_link(self)
     buffer.append('f')
@@ -34,33 +34,33 @@ class Float
   end
 end
 
-class String
+class ::String
   def __marshal__(buffer)
     buffer.save_link(self)
     buffer.write_ivars_prefix(self)
     buffer.write_extends(self)
-    buffer.write_user_class(String, self)
+    buffer.write_user_class(::String, self)
     buffer.append('"')
     buffer.write_string(self)
   end
 end
 
-class Array
+class ::Array
   def __marshal__(buffer)
     buffer.save_link(self)
     buffer.write_ivars_prefix(self)
     buffer.write_extends(self)
-    buffer.write_user_class(Array, self)
+    buffer.write_user_class(::Array, self)
     buffer.append('[')
     buffer.write_array(self)
     buffer.write_ivars_suffix(self)
   end
 end
 
-class Hash
+class ::Hash
   def __marshal__(buffer)
     if default_proc
-      raise TypeError, "can't dump hash with default proc"
+      ::Kernel.raise ::TypeError, "can't dump hash with default proc"
     end
 
     buffer.save_link(self)
@@ -79,40 +79,40 @@ class Hash
   end
 end
 
-class Regexp
+class ::Regexp
   def __marshal__(buffer)
     buffer.save_link(self)
     buffer.write_ivars_prefix(self)
     buffer.write_extends(self)
-    buffer.write_user_class(Regexp, self)
+    buffer.write_user_class(::Regexp, self)
     buffer.append('/')
     buffer.write_regexp(self)
     buffer.write_ivars_suffix(self)
   end
 end
 
-class Proc
+class ::Proc
   def __marshal__(buffer)
-    raise TypeError, "no _dump_data is defined for class #{self.class}"
+    ::Kernel.raise ::TypeError, "no _dump_data is defined for class #{self.class}"
   end
 end
 
-class Method
+class ::Method
   def __marshal__(buffer)
-    raise TypeError, "no _dump_data is defined for class #{self.class}"
+    ::Kernel.raise ::TypeError, "no _dump_data is defined for class #{self.class}"
   end
 end
 
-class MatchData
+class ::MatchData
   def __marshal__(buffer)
-    raise TypeError, "no _dump_data is defined for class #{self.class}"
+    ::Kernel.raise ::TypeError, "no _dump_data is defined for class #{self.class}"
   end
 end
 
-class Module
+class ::Module
   def __marshal__(buffer)
     unless name
-      raise TypeError, "can't dump anonymous module"
+      ::Kernel.raise ::TypeError, "can't dump anonymous module"
     end
 
     buffer.save_link(self)
@@ -121,14 +121,14 @@ class Module
   end
 end
 
-class Class
+class ::Class
   def __marshal__(buffer)
     unless name
-      raise TypeError, "can't dump anonymous class"
+      ::Kernel.raise ::TypeError, "can't dump anonymous class"
     end
 
     if singleton_class?
-      raise TypeError, "singleton class can't be dumped"
+      ::Kernel.raise ::TypeError, "singleton class can't be dumped"
     end
 
     buffer.save_link(self)
@@ -137,7 +137,7 @@ class Class
   end
 end
 
-class BasicObject
+class ::BasicObject
   def __marshal__(buffer)
     buffer.save_link(self)
     buffer.write_extends(self)
@@ -146,7 +146,7 @@ class BasicObject
   end
 end
 
-class Range
+class ::Range
   def __marshal__(buffer)
     buffer.save_link(self)
     buffer.write_extends(self)
@@ -162,7 +162,7 @@ class Range
   end
 end
 
-class Struct
+class ::Struct
   def __marshal__(buffer)
     buffer.save_link(self)
     buffer.write_ivars_prefix(self)
@@ -178,8 +178,8 @@ class Struct
   end
 end
 
-module Marshal
-  class WriteBuffer
+module ::Marshal
+  class self::WriteBuffer
     attr_reader :buffer
 
     %x{
@@ -194,7 +194,7 @@ module Marshal
       @object = object
       @buffer = ''
       @cache = []
-      @extends = Hash.new { |h, k| h[k] = [] }
+      @extends = ::Hash.new { |h, k| h[k] = [] }
       append(version)
     end
 
@@ -207,16 +207,17 @@ module Marshal
         write_userdef(object)
       else
         case object
-        when nil, true, false, Proc, Method, MatchData, Range, Struct, Array, Class, Module, Hash, Regexp
+        when nil, true, false, ::Proc, ::Method, ::MatchData, ::Range, ::Struct,
+             ::Array, ::Class, ::Module, ::Hash, ::Regexp
           object.__marshal__(self)
-        when Integer
-          Integer.instance_method(:__marshal__).bind(object).call(self)
-        when Float
-          Float.instance_method(:__marshal__).bind(object).call(self)
-        when String
-          String.instance_method(:__marshal__).bind(object).call(self)
+        when ::Integer
+          ::Integer.instance_method(:__marshal__).bind(object).call(self)
+        when ::Float
+          ::Float.instance_method(:__marshal__).bind(object).call(self)
+        when ::String
+          ::String.instance_method(:__marshal__).bind(object).call(self)
         else
-          BasicObject.instance_method(:__marshal__).bind(object).call(self)
+          ::BasicObject.instance_method(:__marshal__).bind(object).call(self)
         end
       end
 
@@ -322,11 +323,11 @@ module Marshal
     end
 
     def write_float(f)
-      if f.equal?(Float::INFINITY)
+      if f.equal?(::Float::INFINITY)
         write_string('inf')
-      elsif f.equal?(-Float::INFINITY)
+      elsif f.equal?(-::Float::INFINITY)
         write_string('-inf')
-      elsif f.equal?(Float::NAN)
+      elsif f.equal?(::Float::NAN)
         write_string('nan')
       else
         write_string(f.to_s)
@@ -378,7 +379,7 @@ module Marshal
       klass = object.class
       append('U')
       namespace = `#{klass}.$$base_module`
-      if namespace.equal?(Object)
+      if namespace.equal?(::Object)
         append_symbol(`#{klass}.$$name`)
       else
         append_symbol(namespace.name + '::' + `#{klass}.$$name`)
@@ -389,8 +390,8 @@ module Marshal
     def write_userdef(object)
       value = object._dump(0)
 
-      unless value.is_a?(String)
-        raise TypeError, '_dump() must return string'
+      unless value.is_a?(::String)
+        ::Kernel.raise ::TypeError, '_dump() must return string'
       end
 
       write_ivars_prefix(value)

data/opal/corelib/marshal.rb

@@ -1,17 +1,17 @@
 require 'corelib/marshal/read_buffer'
 require 'corelib/marshal/write_buffer'
 
-module Marshal
+module ::Marshal
   MAJOR_VERSION = 4
   MINOR_VERSION = 8
 
   class << self
     def dump(object)
-      WriteBuffer.new(object).write
+      self::WriteBuffer.new(object).write
     end
 
     def load(marshaled)
-      ReadBuffer.new(marshaled).read
+      self::ReadBuffer.new(marshaled).read
     end
 
     alias restore load

data/opal/corelib/math.rb

@@ -1,10 +1,10 @@
 # helpers: type_error
 
-module Math
-  E  = `Math.E`
-  PI = `Math.PI`
+module ::Math
+  self::E  = `Math.E`
+  self::PI = `Math.PI`
 
-  DomainError = Class.new(StandardError)
+  self::DomainError = ::Class.new(::StandardError)
 
   def self.checked(method, *args)
     %x{
@@ -15,7 +15,7 @@ module Math
       var result = Math[method].apply(null, args);
 
       if (isNaN(result)) {
-        #{raise DomainError, "Numerical argument is out of domain - \"#{method}\""};
+        #{::Kernel.raise DomainError, "Numerical argument is out of domain - \"#{method}\""};
       }
 
       return result;
@@ -23,21 +23,21 @@ module Math
   end
 
   def self.float!(value)
-    Float(value)
-  rescue ArgumentError
-    raise `$type_error(value, #{Float})`
+    ::Kernel.Float(value)
+  rescue ::ArgumentError
+    ::Kernel.raise `$type_error(value, #{::Float})`
   end
 
   def self.integer!(value)
-    Integer(value)
-  rescue ArgumentError
-    raise `$type_error(value, #{Integer})`
+    ::Kernel.Integer(value)
+  rescue ::ArgumentError
+    ::Kernel.raise `$type_error(value, #{::Integer})`
   end
 
   module_function
 
   def acos(x)
-    Math.checked :acos, Math.float!(x)
+    ::Math.checked :acos, ::Math.float!(x)
   end
 
   unless defined?(`Math.acosh`)
@@ -49,11 +49,11 @@ module Math
   end
 
   def acosh(x)
-    Math.checked :acosh, Math.float!(x)
+    ::Math.checked :acosh, ::Math.float!(x)
   end
 
   def asin(x)
-    Math.checked :asin, Math.float!(x)
+    ::Math.checked :asin, ::Math.float!(x)
   end
 
   unless defined?(`Math.asinh`)
@@ -65,15 +65,15 @@ module Math
   end
 
   def asinh(x)
-    Math.checked :asinh, Math.float!(x)
+    ::Math.checked :asinh, ::Math.float!(x)
   end
 
   def atan(x)
-    Math.checked :atan, Math.float!(x)
+    ::Math.checked :atan, ::Math.float!(x)
   end
 
   def atan2(y, x)
-    Math.checked :atan2, Math.float!(y), Math.float!(x)
+    ::Math.checked :atan2, ::Math.float!(y), ::Math.float!(x)
   end
 
   unless defined?(`Math.atanh`)
@@ -85,7 +85,7 @@ module Math
   end
 
   def atanh(x)
-    Math.checked :atanh, Math.float!(x)
+    ::Math.checked :atanh, ::Math.float!(x)
   end
 
   unless defined?(`Math.cbrt`)
@@ -135,11 +135,11 @@ module Math
   end
 
   def cbrt(x)
-    Math.checked :cbrt, Math.float!(x)
+    ::Math.checked :cbrt, ::Math.float!(x)
   end
 
   def cos(x)
-    Math.checked :cos, Math.float!(x)
+    ::Math.checked :cos, ::Math.float!(x)
   end
 
   unless defined?(`Math.cosh`)
@@ -151,12 +151,12 @@ module Math
   end
 
   def cosh(x)
-    Math.checked :cosh, Math.float!(x)
+    ::Math.checked :cosh, ::Math.float!(x)
   end
 
   unless defined?(`Math.erf`)
     %x{
-      Opal.defineProperty(Math, 'erf', function(x) {
+      Opal.prop(Math, 'erf', function(x) {
         var A1 =  0.254829592,
             A2 = -0.284496736,
             A3 =  1.421413741,
@@ -181,12 +181,12 @@ module Math
   end
 
   def erf(x)
-    Math.checked :erf, Math.float!(x)
+    ::Math.checked :erf, ::Math.float!(x)
   end
 
   unless defined?(`Math.erfc`)
     %x{
-      Opal.defineProperty(Math, 'erfc', function(x) {
+      Opal.prop(Math, 'erfc', function(x) {
         var z = Math.abs(x),
             t = 1.0 / (0.5 * z + 1.0);
 
@@ -214,11 +214,11 @@ module Math
   end
 
   def erfc(x)
-    Math.checked :erfc, Math.float!(x)
+    ::Math.checked :erfc, ::Math.float!(x)
   end
 
   def exp(x)
-    Math.checked :exp, Math.float!(x)
+    ::Math.checked :exp, ::Math.float!(x)
   end
 
   def frexp(x)
@@ -272,7 +272,7 @@ module Math
       }
 
       if (n === -1 || n === -Infinity) {
-        #{raise DomainError, 'Numerical argument is out of domain - "gamma"'};
+        #{::Kernel.raise DomainError, 'Numerical argument is out of domain - "gamma"'};
       }
 
       if (#{Integer === n}) {
@@ -300,7 +300,7 @@ module Math
       }
 
       if (n < 0.5) {
-        return Math.PI / (Math.sin(Math.PI * n) * #{Math.gamma(1 - n)});
+        return Math.PI / (Math.sin(Math.PI * n) * #{::Math.gamma(1 - n)});
       }
 
       if (n >= 171.35) {
@@ -341,7 +341,7 @@ module Math
   end
 
   def hypot(x, y)
-    Math.checked :hypot, Math.float!(x), Math.float!(y)
+    ::Math.checked :hypot, ::Math.float!(x), ::Math.float!(y)
   end
 
   def ldexp(mantissa, exponent)
@@ -350,7 +350,7 @@ module Math
 
     %x{
       if (isNaN(exponent)) {
-        #{raise RangeError, 'float NaN out of range of integer'};
+        #{::Kernel.raise ::RangeError, 'float NaN out of range of integer'};
       }
 
       return mantissa * Math.pow(2, exponent);
@@ -363,24 +363,24 @@ module Math
         return [Infinity, 1];
       }
       else {
-        return [Math.log(Math.abs(#{Math.gamma(n)})), #{Math.gamma(n)} < 0 ? -1 : 1];
+        return [Math.log(Math.abs(#{::Math.gamma(n)})), #{::Math.gamma(n)} < 0 ? -1 : 1];
       }
     }
   end
 
   def log(x, base = undefined)
-    if String === x
-      raise `$type_error(x, #{Float})`
+    if ::String === x
+      ::Kernel.raise `$type_error(x, #{::Float})`
     end
 
     if `base == null`
-      Math.checked :log, Math.float!(x)
+      ::Math.checked :log, ::Math.float!(x)
     else
-      if String === base
-        raise `$type_error(base, #{Float})`
+      if ::String === base
+        ::Kernel.raise `$type_error(base, #{::Float})`
       end
 
-      Math.checked(:log, Math.float!(x)) / Math.checked(:log, Math.float!(base))
+      ::Math.checked(:log, ::Math.float!(x)) / ::Math.checked(:log, ::Math.float!(base))
     end
   end
 
@@ -393,11 +393,11 @@ module Math
   end
 
   def log10(x)
-    if String === x
-      raise `$type_error(x, #{Float})`
+    if ::String === x
+      ::Kernel.raise `$type_error(x, #{::Float})`
     end
 
-    Math.checked :log10, Math.float!(x)
+    ::Math.checked :log10, ::Math.float!(x)
   end
 
   unless defined?(`Math.log2`)
@@ -409,15 +409,15 @@ module Math
   end
 
   def log2(x)
-    if String === x
-      raise `$type_error(x, #{Float})`
+    if ::String === x
+      ::Kernel.raise `$type_error(x, #{::Float})`
     end
 
-    Math.checked :log2, Math.float!(x)
+    ::Math.checked :log2, ::Math.float!(x)
   end
 
   def sin(x)
-    Math.checked :sin, Math.float!(x)
+    ::Math.checked :sin, ::Math.float!(x)
   end
 
   unless defined?(`Math.sinh`)
@@ -429,21 +429,21 @@ module Math
   end
 
   def sinh(x)
-    Math.checked :sinh, Math.float!(x)
+    ::Math.checked :sinh, ::Math.float!(x)
   end
 
   def sqrt(x)
-    Math.checked :sqrt, Math.float!(x)
+    ::Math.checked :sqrt, ::Math.float!(x)
   end
 
   def tan(x)
-    x = Math.float!(x)
+    x = ::Math.float!(x)
 
     if x.infinite?
-      return Float::NAN
+      return ::Float::NAN
     end
 
-    Math.checked :tan, Math.float!(x)
+    ::Math.checked :tan, ::Math.float!(x)
   end
 
   unless defined?(`Math.tanh`)
@@ -463,6 +463,6 @@ module Math
   end
 
   def tanh(x)
-    Math.checked :tanh, Math.float!(x)
+    ::Math.checked :tanh, ::Math.float!(x)
   end
 end

data/opal/corelib/method.rb

@@ -1,4 +1,4 @@
-class Method
+class ::Method
   attr_reader :owner, :receiver, :name
 
   def initialize(receiver, owner, method, name)
@@ -36,9 +36,6 @@ class Method
     @method.curry(arity)
   end
 
-  alias [] call
-  alias === call
-
   def >>(other)
     @method >> other
   end
@@ -48,7 +45,7 @@ class Method
   end
 
   def unbind
-    UnboundMethod.new(@receiver.class, @owner, @method, @name)
+    ::UnboundMethod.new(@receiver.class, @owner, @method, @name)
   end
 
   def to_proc
@@ -65,9 +62,12 @@ class Method
   def inspect
     "#<#{self.class}: #{@receiver.class}##{@name} (defined in #{@owner} in #{source_location.join(':')})>"
   end
+
+  alias [] call
+  alias === call
 end
 
-class UnboundMethod
+class ::UnboundMethod
   attr_reader :source, :owner, :name
 
   def initialize(source, owner, method, name)
@@ -96,14 +96,18 @@ class UnboundMethod
   def bind(object)
     %x{
       if (#{@owner}.$$is_module || Opal.is_a(#{object}, #{@owner})) {
-        return #{Method.new(object, @owner, @method, @name)};
+        return #{::Method.new(object, @owner, @method, @name)};
       }
       else {
-        #{raise TypeError, "can't bind singleton method to a different class (expected #{object}.kind_of?(#{@owner} to be true)"};
+        #{::Kernel.raise ::TypeError, "can't bind singleton method to a different class (expected #{object}.kind_of?(#{@owner} to be true)"};
       }
     }
   end
 
+  def bind_call(object, *args, &block)
+    bind(object).call(*args, &block)
+  end
+
   def inspect
     "#<#{self.class}: #{@source}##{@name} (defined in #{@owner} in #{source_location.join(':')})>"
   end