opal 0.4.3 → 0.4.4

data/corelib/opal.rb

@@ -1,22 +1,25 @@
-require 'opal/runtime'
-require 'opal/class'
-require 'opal/basic_object'
-require 'opal/kernel'
-require 'opal/nil_class'
-require 'opal/boolean'
-require 'opal/error'
-require 'opal/regexp'
-require 'opal/comparable'
-require 'opal/enumerable'
-require 'opal/enumerator'
-require 'opal/array'
-require 'opal/hash'
-require 'opal/string'
-require 'opal/numeric'
-require 'opal/proc'
-require 'opal/range'
-require 'opal/time'
-require 'opal/native'
+require 'runtime'
+require 'module'
+require 'class'
+require 'basic_object'
+require 'kernel'
+require 'nil_class'
+require 'boolean'
+require 'error'
+require 'regexp'
+require 'comparable'
+require 'enumerable'
+require 'enumerator'
+require 'array'
+require 'hash'
+require 'string'
+require 'numeric'
+require 'proc'
+require 'range'
+require 'time'
+require 'struct'
+require 'native'
+require 'io'
 
 # regexp matches
 $& = $~ = $` = $' = nil
@@ -26,9 +29,10 @@ $:            = []
 
 # split lines
 $/            = "\n"
+$,            = " "
 
 # native global
-$$ = $global = `Opal.global`
+$$ = $global = Native(`Opal.global`)
 
 ARGV          = []
 ARGF          = Object.new
@@ -37,15 +41,28 @@ TRUE          = true
 FALSE         = false
 NIL           = nil
 
-STDERR        = $stderr = Object.new
-STDIN         = $stdin  = Object.new
-STDOUT        = $stdout = Object.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 {
+        $opal.puts(#{ `strs[i]`.to_s });
+      }
+    }
+  }
+  nil
+end
 
 RUBY_PLATFORM = 'opal'
 RUBY_ENGINE   = 'opal'
 RUBY_VERSION  = '1.9.3'
-RUBY_ENGINE_VERSION = '0.4.3'
-RUBY_RELEASE_DATE = '2013-07-24'
+RUBY_ENGINE_VERSION = '0.4.4'
+RUBY_RELEASE_DATE = '2013-08-13'
 
 def self.to_s
   'main'

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

@@ -3,7 +3,7 @@ class Proc
   `def.is_lambda = true`
 
   def self.new(&block)
-    `if (block === nil) no_block_given();`
+    `if (block === nil) { throw new Error("no block given"); }`
     `block.is_lambda = false`
     block
   end
@@ -12,8 +12,8 @@ class Proc
     %x{
       var result = #{self}.apply(null, #{args});
 
-      if (result === __breaker) {
-        return __breaker.$v;
+      if (result === $breaker) {
+        return $breaker.$v;
       }
 
       return result;

data/corelib/{opal/range.rb → range.rb}

@@ -42,6 +42,10 @@ class Range
     `#{self}.begin` <= value && value <= (exclude_end? ? `#{self}.end` - 1 : `#{self}.end`)
   end
 
+  def last
+    self.end
+  end
+
   def each(&block)
     current = min
 
@@ -67,7 +71,7 @@ class Range
   end
 
   # FIXME: currently hardcoded to assume range holds numerics
-  def include?(val)
+  def include?(obj)
     `return obj >= #{self}.begin && obj <= #{self}.end`
   end
 

data/corelib/{opal/runtime.js → runtime.js}

@@ -11,6 +11,9 @@
   // Class' class
   function Class(){}
 
+  // Module's class
+  function Module(){}
+
   // the class of nil
   function NilClass(){}
 
@@ -27,8 +30,8 @@
   Opal.global = this;
 
   // Minify common function calls
-  var __hasOwn = Opal.hasOwnProperty;
-  var __slice  = Opal.slice = Array.prototype.slice;
+  var $hasOwn = Opal.hasOwnProperty;
+  var $slice  = Opal.slice = Array.prototype.slice;
 
   // Generates unique id for every ruby object
   var unique_id = 0;
@@ -61,20 +64,6 @@
     }
   }
 
-  /*
-    Define a bridged class. Bridged classes will always be in the top level
-    scope, and will always be a subclass of Object.
-  */
-  Opal.bridge = function(name, constructor) {
-    var klass = bridge_class(constructor);
-
-    klass._name = name;
-
-    create_scope(Opal, klass, name);
-
-    return klass;
-  };
-
   Opal.klass = function(base, superklass, id, constructor) {
     var klass;
 
@@ -86,7 +75,7 @@
       superklass = ObjectClass;
     }
 
-    if (__hasOwn.call(base._scope, id)) {
+    if ($hasOwn.call(base._scope, id)) {
       klass = base._scope[id];
 
       if (!klass._isClass) {
@@ -122,7 +111,7 @@
       base = base._klass;
     }
 
-    if (__hasOwn.call(base._scope, id)) {
+    if ($hasOwn.call(base._scope, id)) {
       klass = base._scope[id];
 
       if (!klass._mod$ && klass !== ObjectClass) {
@@ -142,11 +131,6 @@
     return klass;
   };
 
-  // Utility function to raise a "no block given" error
-  var no_block_given = function() {
-    throw new Error('no block given');
-  };
-
   // Boot a base class (makes instances).
   var boot_defclass = function(id, constructor, superklass) {
     if (superklass) {
@@ -175,7 +159,6 @@
     RubyClass.prototype = new ctor();
 
     var prototype         = RubyClass.prototype;
-    prototype._isBoot = true;
     prototype._alloc      = klass;
     prototype._isClass    = true;
     prototype._name       = id;
@@ -230,7 +213,7 @@
     return constructor;
   };
 
-  var bridge_class = function(constructor) {
+  var bridge_class = function(name, constructor) {
     var klass = boot_class(ObjectClass, constructor);
     var i, length, m;
 
@@ -249,184 +232,102 @@
       constructor.prototype[m] = table[m];
     }
 
+    klass._name = name;
+    create_scope(Opal, klass, name);
+
     return klass;
   };
 
   Opal.puts = function(a) { console.log(a); };
 
-  var native_singleton = {
-    _scope: Opal,
-    prototype: null
-  };
-
-  // Singleton class
-  Opal.singleton = function(obj) {
-    if (obj == null) {
-      return Opal.NilClass;
-    }
-    else if (obj.$singleton_class) {
-      return obj.$singleton_class();
-    }
-    else {
-      native_singleton.prototype = obj;
-      return native_singleton;
-    }
-  };
-
-  // Method missing dispatcher
-  Opal.mm = function(mid) {
-    var dispatcher = function() {
-      var args = __slice.call(arguments);
+  Opal.add_stubs = function(stubs) {
+    for (var i = 0, length = stubs.length; i < length; i++) {
+      var stub = stubs[i];
 
-      if (this.$method_missing) {
-        this.$method_missing._p = dispatcher._p;
-        return this.$method_missing.apply(this, [mid].concat(args));
-      }
-      else {
-        native_send._p = dispatcher._p;
-        return native_send(this, mid, args);
+      if (!BasicObject.prototype[stub]) {
+        BasicObject.prototype[stub] = true;
+        add_stub_for(BasicObject.prototype, stub);
       }
-    };
-
-    return dispatcher;
-  };
-
-  // send a method to a native object
-  var native_send = function(obj, mid, args) {
-    var prop, block = native_send._p;
-    native_send._p = null;
-
-    if ( (prop = native_methods[mid]) ) {
-      return prop(obj, args, block);
     }
+  };
 
-    prop = obj[mid];
+  function add_stub_for(prototype, stub) {
+    function method_missing_stub() {
+      this.$method_missing._p = method_missing_stub._p;
+      method_missing_stub._p = null;
 
-    if (typeof(prop) === "function") {
-      prop = prop.apply(obj, args.$to_n());
+      return this.$method_missing.apply(this, [stub.slice(1)].concat($slice.call(arguments)));
     }
-    else if (mid.charAt(mid.length - 1) === "=") {
-      prop = mid.slice(0, mid.length - 1);
 
-      if (args[0] === nil) {
-        obj[prop] = null;
-        return nil;
-      }
-
-      return obj[prop] = args[0];
-    }
+    method_missing_stub.rb_stub = true;
+    prototype[stub] = method_missing_stub;
+  }
 
-    if (prop == null) {
-      return nil;
-    }
+  Opal.add_stub_for = add_stub_for;
 
-    return prop;
+  // Const missing dispatcher
+  Opal.cm = function(name) {
+    return this.base.$const_missing(name);
   };
 
-  var native_methods = {
-    "==": function(obj, args) {
-      return obj === args[0];
-    },
-
-    "[]": function(obj, args) {
-      var prop = obj[args[0]];
-
-      if (prop == null) {
-        return nil;
-      }
-
-      return prop;
-    },
-
-    "[]=": function(obj, args) {
-      var value = args[1];
-
-      if (value === nil) {
-        value = null;
-      }
-
-      return obj[args[0]] = value;
-    },
+  // Arity count error dispatcher
+  Opal.ac = function(actual, expected, object, meth) {
+    var inspect = ((typeof(object) !== 'function') ? object.constructor._name + '#' : object._name + '.') + meth;
+    var msg = '[' + inspect + '] wrong number of arguments(' + actual + ' for ' + expected + ')';
+    throw Opal.ArgumentError.$new(msg);
+  };
 
-    "inspect": function(obj) {
-      return obj.toString();
-    },
+  // Super dispatcher
+  Opal.dispatch_super = function(obj, jsid, args, iter, defs) {
+    var dispatcher;
 
-    "to_s": function(obj) {
-      return obj.toString();
-    },
+    if (defs) {
+      dispatcher = obj._isClass ? defs._super : obj._klass._proto;
+    }
+    else {
+      dispatcher = obj._isClass ? obj._klass : obj._klass._super._proto;
+    }
 
-    "respond_to?": function(obj, args) {
-      return obj[args[0]] != null;
-    },
+    dispatcher = dispatcher['$' + jsid];
+    dispatcher._p = iter;
 
-    "each": function(obj, args, block) {
-      var prop;
+    return dispatcher.apply(obj, args);
+  };
 
-      if (obj.length === +obj.length) {
-        for (var i = 0, len = obj.length; i < len; i++) {
-          prop = obj[i];
+  // return helper
+  Opal.$return = function(val) {
+    Opal.returner.$v = val;
+    throw Opal.returner;
+  };
 
-          if (prop == null) {
-            prop = nil;
-          }
+  // handles yield calls for 1 yielded arg
+  Opal.$yield1 = function(block, arg) {
+    if (typeof(block) !== "function") {
+      throw Opal.LocalJumpError.$new("no block given");
+    }
 
-          block(prop);
-        }
+    if (block.length > 1) {
+      if (arg._isArray) {
+        return block.apply(null, arg);
       }
       else {
-        for (var key in obj) {
-          prop = obj[key];
-
-          if (prop == null) {
-            prop = nil;
-          }
-
-          block(key, prop);
-        }
+        return block(arg);
       }
-
-      return obj;
-    },
-
-    "to_a": function(obj, args) {
-      var result = [];
-
-      for (var i = 0, length = obj.length; i < length; i++) {
-        result.push(obj[i]);
-      }
-
-      return result;
-    },
-
-    "to_h": function(obj) {
-      var keys = [], values = {}, value;
-
-      for (var key in obj) {
-        value = obj[key];
-        keys.push(key);
-
-        if (value == null) {
-          value = nil;
-        }
-
-        values[key] = value;
-      }
-
-      return Opal.hash2(keys, values);
+    }
+    else {
+      return block(arg);
     }
   };
 
-  // Const missing dispatcher
-  Opal.cm = function(name) {
-    return this.base.$const_missing(name);
-  };
+  // handles yield for > 1 yielded arg
+  Opal.$yieldX = function(block, args) {
+    if (block.length > 1 && args.length == 1) {
+      if (args[0]._isArray) {
+        return block.apply(null, args[0]);
+      }
+    }
 
-  // Arity count error dispatcher
-  Opal.ac = function(actual, expected, object, meth) {
-    var inspect = ((typeof(object) !== 'function') ? object.constructor._name + '#' : object._name + '.') + meth;
-    var msg = '[' + inspect + '] wrong number of arguments(' + actual + ' for ' + expected + ')';
-    throw Opal.ArgumentError.$new(msg);
+    return block.apply(null, args);
   };
 
   /*
@@ -445,7 +346,7 @@
     @param [String] mid ruby method to call
   */
   Opal.send = function(recv, mid) {
-    var args = __slice.call(arguments, 2),
+    var args = $slice.call(arguments, 2),
         func = recv['$' + mid];
 
     if (func) {
@@ -456,7 +357,7 @@
   };
 
   Opal.block_send = function(recv, mid, block) {
-    var args = __slice.call(arguments, 3),
+    var args = $slice.call(arguments, 3),
         func = recv['$' + mid];
 
     if (func) {
@@ -500,22 +401,26 @@
   // Constructors for *instances* of core objects
   boot_defclass('BasicObject', BasicObject);
   boot_defclass('Object', Object, BasicObject);
-  boot_defclass('Class', Class, Object);
+  boot_defclass('Module', Module, Object);
+  boot_defclass('Class', Class, Module);
 
   // Constructors for *classes* of core objects
   var BasicObjectClass = boot_makemeta('BasicObject', BasicObject, Class);
   var ObjectClass      = boot_makemeta('Object', Object, BasicObjectClass.constructor);
-  var ClassClass       = boot_makemeta('Class', Class, ObjectClass.constructor);
+  var ModuleClass      = boot_makemeta('Module', Module, ObjectClass.constructor);
+  var ClassClass       = boot_makemeta('Class', Class, ModuleClass.constructor);
 
   // Fix booted classes to use their metaclass
   BasicObjectClass._klass = ClassClass;
   ObjectClass._klass = ClassClass;
+  ModuleClass._klass = ClassClass;
   ClassClass._klass = ClassClass;
 
   // Fix superclasses of booted classes
   BasicObjectClass._super = null;
   ObjectClass._super = BasicObjectClass;
-  ClassClass._super = ObjectClass;
+  ModuleClass._super = ObjectClass;
+  ClassClass._super = ModuleClass;
 
   // Defines methods onto Object (which are then donated to bridged classes)
   ObjectClass._defn = function (mid, body) {
@@ -527,15 +432,17 @@
 
   Opal.base = ObjectClass;
   BasicObjectClass._scope = ObjectClass._scope = Opal;
-  Opal.Module = Opal.Class;
   Opal.Kernel = ObjectClass;
 
+  create_scope(Opal, ModuleClass);
   create_scope(Opal, ClassClass);
 
   ObjectClass._proto.toString = function() {
     return this.$to_s();
   };
 
+  ClassClass._proto._defn = function(mid, body) { this._proto[mid] = body; };
+
   Opal.top = new ObjectClass._alloc();
 
   Opal.klass(ObjectClass, ObjectClass, 'NilClass', NilClass);
@@ -544,15 +451,16 @@
   nil.call = nil.apply = function() { throw Opal.LocalJumpError.$new('no block given'); };
 
   Opal.breaker  = new Error('unexpected break');
-
-  Opal.bridge('Array', Array);
-  Opal.bridge('Boolean', Boolean);
-  Opal.bridge('Numeric', Number);
-  Opal.bridge('String', String);
-  Opal.bridge('Proc', Function);
-  Opal.bridge('Exception', Error);
-  Opal.bridge('Regexp', RegExp);
-  Opal.bridge('Time', Date);
+  Opal.returner = new Error('unexpected return');
+
+  bridge_class('Array', Array);
+  bridge_class('Boolean', Boolean);
+  bridge_class('Numeric', Number);
+  bridge_class('String', String);
+  bridge_class('Proc', Function);
+  bridge_class('Exception', Error);
+  bridge_class('Regexp', RegExp);
+  bridge_class('Time', Date);
 
   TypeError._super = Error;
 }).call(this);