opal 0.3.18 → 0.3.19

data/Rakefile

@@ -5,27 +5,28 @@ Bundler.setup
 require 'opal'
 require 'opal/version'
 
+Opal::BuilderTask.new do |t|
+  t.name         = 'opal'
+  t.files        = []
+  t.dependencies = %w[opal-spec]
+  t.specs_dir    = 'test'
+  t.specs_main   = 'test/spec_helper'
+end
+
 desc "Build opal.js runtime into ./build"
-task :opal do
+task :build do
   File.open('build/opal.js', 'w+') do |o|
     o.write Opal::Builder.runtime
   end
 end
 
-Opal::BuilderTask.new do |t|
-  t.name         = 'opal'
-  t.files        = []
-  t.specs_dir    = './core/spec'
-  t.dependencies = %w[opal-spec opal-racc opal-strscan]
-end
-
 desc "Check file sizes for opal.js runtime"
 task :sizes do
   o = File.read 'build/opal.js'
   m = uglify o
   g = gzip m
 
-  puts "#{opal.js}:"
+  puts "opal.js:"
   puts "development: #{o.size}, minified: #{m.size}, gzipped: #{g.size}"
 end
 
@@ -63,47 +64,4 @@ namespace :gem do
   task :release do
     puts "Need to release opal-#{Opal::VERSION}.gem"
   end
-end
-
-# Documentation
-namespace :docs do
-  task :clone do
-    if File.exists? 'gh-pages'
-     Dir.chdir('gh-pages') { sh 'git pull origin gh-pages' }
-    else
-      FileUtils.mkdir_p 'gh-pages'
-      Dir.chdir('gh-pages') do
-        sh 'git clone git@github.com:/adambeynon/opal.git .'
-        sh 'git checkout gh-pages'
-      end
-    end
-  end
-
-  task :build do
-    require 'redcarpet'
-    require 'albino'
-
-    klass = Class.new(Redcarpet::Render::HTML) do
-      def block_code(code, language)
-        Albino.new(code, language || :text).colorize
-      end
-    end
-
-    markdown = Redcarpet::Markdown.new(klass, :fenced_code_blocks => true)
-    sources  = %w[index]
-
-    sources.each do |s|
-      File.open(File.join('gh-pages', "#{s}.html"), 'w+') do |o|
-        o.write File.read('docs/pre.html')
-        o.write markdown.render(File.read "docs/#{s}.md")
-        o.write File.read('docs/post.html')
-      end
-    end
-  end
-
-  task :copy do
-    FileUtils.cp 'build/opal.js',   'gh-pages/opal.js'
-    FileUtils.cp 'docs/styles.css', 'gh-pages/styles.css'
-    FileUtils.cp 'docs/syntax.css', 'gh-pages/syntax.css'
-  end
 end

data/core/array.rb

@@ -1,4 +1,8 @@
-class Array
+class Array < `Array`
+  %x{
+    def._isArray = true;
+  }
+
   include Enumerable
 
   def self.[](*objects)
@@ -11,17 +15,8 @@ class Array
     }
   end
 
-  def self.allocate
-    %x{
-      var array         = [];
-          array._klass = this;
-
-      return array;
-    }
-  end
-
   def self.new(*a)
-    `[]`
+    allocate
   end
 
   def &(other)
@@ -119,7 +114,7 @@ class Array
       var size = this.length;
 
       if (typeof index !== 'number') {
-        if (index._flags & T_RANGE) {
+        if (index._isRange) {
           var exclude = index.exclude;
           length      = index.end;
           index       = index.begin;
@@ -470,7 +465,7 @@ class Array
       for (var i = 0, length = this.length, item; i < length; i++) {
         item = this[i];
 
-        if (item._flags & T_ARRAY) {
+        if (item._isArray) {
           if (level === undefined) {
             result = result.concat(#{`item`.flatten});
           }
@@ -1000,7 +995,7 @@ class Array
         result[i] = part;
       }
 
-      if (block) {
+      if (block !== nil) {
         for (var i = 0; i < size; i++) {
           block.call(__context, result[i]);
         }

data/core/basic_object.rb

@@ -8,8 +8,7 @@ class BasicObject
 
   def __send__(symbol, *args, &block)
     %x{
-      var meth = this[mid_to_jsid(symbol)] || opal.mm(mid_to_jsid(symbol));
-      args.unshift(block);
+      var meth = this[mid_to_jsid(symbol)];
 
       return meth.apply(this, args);
     }
@@ -22,8 +21,8 @@ class BasicObject
 
   def instance_eval(string, &block)
     %x{
-      if (block == null) {
-        throw RubyArgError.$new('block not supplied');
+      if (block === nil) {
+        no_block_given();
       }
 
       return block.call(this, null, this);
@@ -32,8 +31,8 @@ class BasicObject
 
   def instance_exec(*args, &block)
     %x{
-      if (block == null) {
-        throw RubyArgError.$new('block not supplied');
+      if (block === nil) {
+        no_block_given();
       }
 
       return block.apply(this, args);
@@ -41,9 +40,7 @@ class BasicObject
   end
 
   def method_missing(symbol, *args)
-    `throw RubyNoMethodError.$new(null, 'undefined method \`' + symbol + '\` for ' + #{inspect});`
-
-    self
+    raise NoMethodError, "undefined method `#{symbol}` for #{inspect}"
   end
 
   def singleton_method_added(symbol)
@@ -54,4 +51,4 @@ class BasicObject
 
   def singleton_method_undefined(symbol)
   end
-end
+end

data/core/boolean.rb

@@ -1,4 +1,8 @@
-class Boolean
+class Boolean < `Boolean`
+  %x{
+    def._isBoolean = true;
+  }
+
   def &(other)
     `(this == true) ? (other !== false && other !== nil) : false`
   end

data/core/class.rb

@@ -2,40 +2,14 @@ class Class
   def self.new(sup = Object, &block)
     %x{
       var klass        = boot_class(sup);
-          klass._name = "AnonClass";
+          klass._name = nil;
 
       make_metaclass(klass, sup._klass);
 
-      #{sup.inherited `klass`};
+      sup.$inherited(klass);
 
-      if (block !== null) {
-        block.call(klass, null);
-      }
-
-      return klass;
-    }
-  end
-
-  def bridge_class(constructor)
-    %x{
-      var prototype = constructor.prototype,
-          klass     = this;
-
-      klass._alloc = constructor;
-      klass._proto     = prototype;
-
-      bridged_classes.push(klass);
-
-      prototype._klass = klass;
-      prototype._flags  = T_OBJECT;
-
-      var donator = RubyObject._proto;
-      for (var method in donator) {
-        if (donator.hasOwnProperty(method)) {
-          if (!prototype[method]) {
-            prototype[method] = donator[method];
-          }
-        }
+      if (block !== nil) {
+        block.call(klass);
       }
 
       return klass;
@@ -47,9 +21,12 @@ class Class
   end
 
   def new(*args, &block)
-    obj = allocate()
-    obj.initialize *args, &block
-    obj
+    %x{
+      var obj = this.$allocate();
+      obj._p  = block;
+      obj.$initialize.apply(obj, args);
+      return obj;
+    }
   end
 
   def inherited(cls)
@@ -60,22 +37,22 @@ class Class
       var sup = this._super;
 
       if (!sup) {
-        if (this === RubyObject) {
-          return null;
+        if (this === RubyBasicObject) {
+          return nil;
         }
 
         throw RubyRuntimeError.$new('uninitialized class');
       }
 
-      while (sup && (sup._flags & T_ICLASS)) {
+      while (sup && (sup._isIClass)) {
         sup = sup._super;
       }
 
       if (!sup) {
-        return null;
+        return nil;
       }
 
       return sup;
     }
   end
-end
+end

data/core/dir.rb

@@ -0,0 +1,89 @@
+class Dir
+  def self.getwd
+    ""
+  end
+
+  def self.pwd
+    ""
+  end
+
+  def self.[](*globs)
+    %x{
+      var result = [], files = factories;
+
+      for (var i = 0, ii = globs.length; i < ii; i++) {
+        var glob = globs[i];
+
+        var re = fs_glob_to_regexp(#{ File.expand_path `glob` });
+
+        for (var file in files) {
+          if (re.exec(file)) {
+            result.push(file);
+          }
+        }
+      }
+
+      return result;
+    }
+  end
+
+  %x(
+    function fs_glob_to_regexp(glob) {
+      var parts  = glob.split(''),
+          length = parts.length,
+          result = '';
+
+      var opt_group_stack = 0;
+
+      for (var i = 0; i < length; i++) {
+        var cur = parts[i];
+
+        switch (cur) {
+          case '*':
+            if (parts[i + 1] === '*' && parts[i + 2] === '/') {
+              result += '.*';
+              i += 2;
+            }
+            else {
+              result += '[^/]*';
+            }
+            break;
+
+          case '.':
+            result += '\\\\';
+            result += cur;
+            break;
+
+          case ',':
+            if (opt_group_stack) {
+              result += '|';
+            }
+            else {
+              result += ',';
+            }
+            break;
+
+          case '{':
+            result += '(';
+            opt_group_stack++;
+            break;
+
+          case '}':
+            if (opt_group_stack) {
+              result += ')';
+              opt_group_stack--;
+            }
+            else {
+              result += '}'
+            }
+            break;
+
+          default:
+            result += cur;
+        }
+      }
+
+      return new RegExp('^' + result + '$');
+    }
+  )
+end

data/core/enumerable.rb

@@ -3,7 +3,7 @@ module Enumerable
     %x{
       var result = true, proc;
 
-      if (block) {
+      if (block !== nil) {
         proc = function(obj) {
           var value;
 
@@ -41,7 +41,7 @@ module Enumerable
     %x{
       var result = false, proc;
 
-      if (block) {
+      if (block !== nil) {
         proc = function(obj) {
           var value;
 
@@ -102,7 +102,7 @@ module Enumerable
     %x{
       var result = 0;
 
-      if (!block) {
+      if (block === nil) {
         if (object == null) {
           block = function() { return true; };
         }
@@ -136,20 +136,22 @@ module Enumerable
     %x{
       var result = nil;
 
-      this.$each(function(y, obj) {
+      this.$each._p = function(obj) {
         var value;
 
-        if ((value = $yield.call($context, null, obj)) === $breaker) {
-          return $breaker.$v;
+        if ((value = block.call(__context, obj)) === __breaker) {
+          return __breaker.$v;
         }
 
         if (value !== false && value !== nil) {
           result      = obj;
-          $breaker.$v = nil;
+          __breaker.$v = nil;
 
-          return $breaker;
+          return __breaker;
         }
-      });
+      };
+
+      this.$each();
 
       if (result !== nil) {
         return result;
@@ -164,19 +166,19 @@ module Enumerable
   end
 
   def drop(number)
-    raise NotImplementedError
-
     %x{
       var result  = [],
           current = 0;
 
-      this.$each(function(y, obj) {
+      this.$each._p = function(obj) {
         if (number < current) {
           result.push(e);
         }
 
         current++;
-      });
+      };
+
+      this.$each();
 
       return result;
     }
@@ -188,18 +190,18 @@ module Enumerable
     %x{
       var result = [];
 
-      this.$each.$P = function(y, obj) {
+      this.$each._p = function(obj) {
         var value;
 
-        if ((value = $yield.call($context, null, obj)) === $breaker) {
-          return $breaker.$v;
+        if ((value = block.call(__context, obj)) === __breaker) {
+          return __breaker;
         }
 
         if (value !== false && value !== nil) {
           result.push(obj);
         }
         else {
-          return $breaker;
+          return __breaker;
         }
       };
 
@@ -215,56 +217,120 @@ module Enumerable
     %x{
       var index = 0;
 
-      this.$each(function(y, obj) {
+      this.$each._p = function(obj) {
         var value;
 
-        if ((value = $yield.call($context, null, obj, index)) === $breaker) {
-          return $breaker.$v;
+        if ((value = block.call(__context, obj, index)) === __breaker) {
+          return __breaker.$v;
         }
 
         index++;
-      });
+      };
+
+      this.$each();
 
       return nil;
     }
   end
 
-  def entries
-    result = []
+  def each_with_object(object, &block)
+    return enum_for :each_with_object unless block
+
+    %x{
+      this.$each._p = function(obj) {
+        var value;
+
+        if ((value = block.call(__context, obj, object)) === __breaker) {
+          return __breaker.$v;
+        }
+      };
 
-    each {|*args|
-      result.push args.length == 1 ? args.first : args
+      this.$each();
+
+      return object;
     }
+  end
+
+  def entries
+    %x{
+      var result = [];
+
+      this.$each._p = function(obj) {
+        result.push(obj);
+      };
+
+      this.$each();
 
-    result
+      return result;
+    }
   end
 
   alias find detect
 
-  def find_index(object = undefined, &block)
-    return enum_for :find_index, object unless block
+  def find_all(&block)
+    return enum_for :find_all unless block
 
     %x{
-      if (object !== undefined) {
-        $yield = function (y, obj) { return obj.$eq$(null, object); };
-      }
-
-      var result = nil;
+      var result = [];
 
-      this.$each_with_index(function(y, obj, index) {
+      this.$each._p = function(obj) {
         var value;
 
-        if ((value = $yield.call($context, null, obj)) === $breaker) {
-          return $breaker.$v;
+        if ((value = block.call(__context, obj)) === __breaker) {
+          return __breaker.$v;
         }
 
         if (value !== false && value !== nil) {
-          result     = obj;
-          breaker.$v = index;
+          //result      = obj;
+          //__breaker.$v = nil;
 
-          return $breaker;
+          //return __breaker;
+          result.push(obj);
         }
-      });
+      };
+
+      this.$each();
+
+      return result;
+    }
+  end
+
+  def find_index(object = undefined, &block)
+    %x{
+      var proc, result = nil, index = 0;
+
+      if (object != null) {
+        proc = function (obj) { 
+          if (obj.$eq$(object)) {
+            result = index;
+            return __breaker;
+          }
+          index += 1;
+        };
+      }
+      else if (block === nil) {
+        return this.$enum_for("find_index");
+      } else {
+        proc = function(obj) {
+          var value;
+
+          if ((value = block.call(__context, obj)) === __breaker) {
+            return __breaker.$v;
+          }
+
+          if (value !== false && value !== nil) {
+            result     = index;
+            __breaker.$v = index;
+
+            return __breaker;
+          }
+          index += 1;
+        };
+      }
+
+      this.$each._p = proc;
+
+      this.$each();
 
       return result;
     }
@@ -273,21 +339,29 @@ module Enumerable
   def first(number = undefined)
     %x{
       var result = [],
-          current = 0;
+          current = 0,
+          proc;
 
-      this.$each(number === undefined
-        ? function(y, obj) {
-            result = obj; return $breaker;
-          }
-        : function(y, obj) {
+      if (number == null) {
+        result = nil;
+        proc = function(obj) {
+            result = obj; return __breaker;
+          };
+      } else {
+        proc = function(obj) {
             if (number <= current) {
-              return $breaker;
+              return __breaker;
             }
 
             result.push(obj);
 
             current++;
-          });
+          };
+      }
+
+      this.$each._p = proc;
+
+      this.$each();
 
       return result;
     }
@@ -297,26 +371,28 @@ module Enumerable
     %x{
       var result = [];
 
-      this.$each(block !== nil
-        ? function(y, obj) {
-            var value = pattern.$eqq$(null, obj);
+      this.$each._p = (block !== nil
+        ? function(obj) {
+            var value = pattern.$eqq$(obj);
 
             if (value !== false && value !== nil) {
-              if ((value = $yield.call($context, null, obj)) === $breaker) {
-                return $breaker.$v;
+              if ((value = block.call(__context, obj)) === __breaker) {
+                return __breaker.$v;
               }
 
-              result.push(obj);
+              result.push(value);
             }
           }
-        : function(y, obj) {
-            var value = pattern.$eqq$(null, obj);
+        : function(obj) {
+            var value = pattern.$eqq$(obj);
 
             if (value !== false && value !== nil) {
-              ary.push(obj);
+              result.push(obj);
             }
           });
 
+      this.$each();
+
       return result;
     }
   end