opal 0.3.31 → 0.3.32

data/core/json.rb

@@ -38,11 +38,12 @@ module JSON
             return arr;
           }
           else {
-            var hash = #{ {} }, v, map = hash.map;
+            var hash = #{ {} }, v, map = hash.map, keys = hash.keys;
 
             for (var k in value) {
               if (__hasOwn.call(value, k)) {
                 v = to_opal(value[k]);
+                keys.push(k);
                 map[k] = v;
               }
             }

data/core/kernel.rb

@@ -1,12 +1,17 @@
 module Kernel
+  # bridged from BasicObject
+  alias :initialize :initialize
+  alias :== :==
+  alias :__send__ :__send__
+  alias :eql? :eql?
+  alias :equal? :equal?
+  alias :instance_eval :instance_eval
+  alias :instance_exec :instance_exec
+
   def =~(obj)
     false
   end
 
-  def ==(other)
-    `#{self} === other`
-  end
-
   def ===(other)
     `#{self} == other`
   end
@@ -45,14 +50,6 @@ module Kernel
     }
   end
 
-  def __send__(symbol, *args, &block)
-    %x{
-      return #{self}['$' + symbol].apply(#{self}, args);
-    }
-  end
-
-  alias eql? ==
-
   def Array(object)
     %x{
       if (object.$to_ary) {
@@ -234,39 +231,10 @@ module Kernel
     `#{self}._id`
   end
 
-  def initialize(*)
-  end
-
   def inspect
     to_s
   end
 
-  def instance_eval(&block)
-    %x{
-      if (block === nil) {
-        no_block_given();
-      }
-
-      var block_self = block._s, result;
-
-      block._s = null;
-      result = block.call(#{self}, #{self});
-      block._s = block_self;
-
-      return result;
-    }
-  end
-
-  def instance_exec(*args, &block)
-    %x{
-      if (block === nil) {
-        no_block_given();
-      }
-
-      return block.apply(#{self}, args);
-    }
-  end
-
   def instance_of?(klass)
     `#{self}._klass === klass`
   end

data/core/load_order

@@ -1,5 +1,6 @@
 alpha
 class
+basic_object
 kernel
 nil_class
 boolean

data/core/numeric.rb

@@ -1,6 +1,6 @@
 class Numeric < `Number`
   %x{
-    Numeric_prototype._isNumber = true;
+    Numeric.prototype._isNumber = true;
   }
 
   include Comparable
@@ -204,4 +204,4 @@ class Numeric < `Number`
   end
 end
 
-Fixnum = Numeric
+Fixnum = Numeric

data/core/proc.rb

@@ -1,7 +1,7 @@
 class Proc < `Function`
   %x{
-    Proc_prototype._isProc = true;
-    Proc_prototype.is_lambda = true;
+    Proc.prototype._isProc = true;
+    Proc.prototype.is_lambda = true;
   }
 
   def self.new(&block)

data/core/range.rb

@@ -2,7 +2,7 @@ class Range
   include Enumerable
 
   %x{
-    Range_prototype._isRange = true;
+    Range.prototype._isRange = true;
 
     Opal.range = function(beg, end, exc) {
       var range         = new Range;
@@ -42,7 +42,7 @@ class Range
     `#{self}.begin` <= value && value <= (exclude_end? ? `#{self}.end` - 1 : `#{self}.end`)
   end
 
-  def each
+  def each(&block)
     current = min
 
     while current != max

data/core/runtime.js

@@ -1,6 +1,9 @@
 // The Opal object that is exposed globally
 var Opal = this.Opal = {};
 
+// Very root class
+function BasicObject(){}
+
 // Core Object class
 function Object(){}
 
@@ -216,11 +219,13 @@ Opal.puts = function(a) { console.log(a); };
 // Initialization
 // --------------
 
-boot_defclass('Object', Object);
+boot_defclass('BasicObject', BasicObject)
+boot_defclass('Object', Object, BasicObject);
 boot_defclass('Class', Class, Object);
 
 Class.prototype = Function.prototype;
-Object._klass = Class._klass = Class;
+
+BasicObject._klass = Object._klass = Class._klass = Class;
 
 // Implementation of Class#===
 function module_eqq(object) {
@@ -279,7 +284,7 @@ function __sdonate(defined) {
 
 var bridged_classes = Object.$included_in = [];
 
-Object._scope = Opal;
+BasicObject._scope = Object._scope = Opal;
 Opal.Module = Opal.Class;
 Opal.Kernel = Object;
 
@@ -296,6 +301,5 @@ Opal.top = new Object;
 
 Opal.klass(Object, Object, 'NilClass', NilClass)
 Opal.nil = new NilClass;
-Opal.nil.call = Opal.nil.apply = no_block_given;
 
-Opal.breaker  = new Error('unexpected break');
+Opal.breaker  = new Error('unexpected break');

data/core/string.rb

@@ -1,5 +1,5 @@
 class String < `String`
-  `String_prototype._isString = true`
+  `String.prototype._isString = true`
 
   include Comparable
 
@@ -232,7 +232,7 @@ class String < `String`
 
   alias_native :getbyte, :charCodeAt
 
-  def gsub(pattern, replace, &block)
+  def gsub(pattern, replace)
     if pattern.is_a?(String)
       pattern = /#{Regexp.escape(pattern)}/
     end
@@ -242,7 +242,7 @@ class String < `String`
           options = pattern.substr(pattern.lastIndexOf('/') + 1) + 'g',
           regexp  = pattern.substr(1, pattern.lastIndexOf('/') - 1);
 
-      return #{sub `new RegExp(regexp, options)`, replace, &block};
+      return #{self}.$sub(new RegExp(regexp, options), replace);
     }
   end
 
@@ -397,7 +397,7 @@ class String < `String`
     `#{self}.replace(/^\\s*/, '').replace(/\\s*$/, '')`
   end
 
-  def sub(pattern, replace, &block)
+  def sub(pattern, replace = undefined, &block)
     %x{
       if (typeof(replace) === 'string') {
         return #{self}.replace(pattern, replace);
@@ -408,7 +408,7 @@ class String < `String`
           return block(str);
         });
       }
-      else if (replace != null) {
+      else if (replace !== undefined) {
         if (#{replace.is_a?(Hash)}) {
           return #{self}.replace(pattern, function(str) {
             var value = #{replace[str]};

data/lib/opal.rb

@@ -39,8 +39,8 @@ module Opal
 
     [
       "// Opal v#{Opal::VERSION}",
-      "// http://opal.github.com",
-      "// Copyright 2012, Adam Beynon",
+      "// http://opalrb.org",
+      "// Copyright 2013, Adam Beynon",
       "// Released under the MIT License",
       "(function(undefined) {",
       runtime,

data/lib/opal/parser.rb

@@ -693,7 +693,7 @@ module Opal
       end
 
       itercode = "function(#{params.join ', '}) {\n#{code}\n#@indent}"
-      call << ("(%s = %s, %s._s = %s, %s)" % [identity, itercode, identity, current_self, identity])
+      call[3] << s(:js_tmp, "(%s = %s, %s._s = %s, %s)" % [identity, itercode, identity, current_self, identity])
 
       process call, level
     end
@@ -796,7 +796,7 @@ module Opal
       splat = arglist[1..-1].any? { |a| a.first == :splat }
 
       if Array === arglist.last and arglist.last.first == :block_pass
-        block   = process s(:js_tmp, process(arglist.pop, :expr)), :expr
+        arglist << s(:js_tmp, process(arglist.pop, :expr))
       elsif iter
         block   = iter
       end
@@ -815,24 +815,8 @@ module Opal
 
       args = process arglist, :expr
 
-      result = if block
-        dispatch = "(%s = %s, %s%s._p = %s, %s%s" %
-          [tmprecv, recv_code, tmprecv, mid, block, tmprecv, mid]
-
-        if splat
-          "%s.apply(null, %s))" % [dispatch, args]
-        else
-          "%s(%s))" % [dispatch, args]
-        end
-      else
-        # m_missing = " || __mm(#{meth.to_s.inspect})"
-        # dispatch = "((#{tmprecv} = #{recv_code}).$m#{mid}#{ m_missing })"
-        # splat ? "#{dispatch}.apply(null, #{args})" : "#{dispatch}(#{args})"
-        dispatch = tmprecv ? "(#{tmprecv} = #{recv_code})#{mid}" : "#{recv_code}#{mid}"
-        splat ? "#{dispatch}.apply(#{tmprecv || recv_code}, #{args})" : "#{dispatch}(#{args})"
-      end
-
-      result
+      dispatch = tmprecv ? "(#{tmprecv} = #{recv_code})#{mid}" : "#{recv_code}#{mid}"
+      splat ? "#{dispatch}.apply(#{tmprecv || recv_code}, #{args})" : "#{dispatch}(#{args})"
     end
 
     # s(:arglist, [arg [, arg ..]])
@@ -1035,22 +1019,28 @@ module Opal
       # opt args if last arg is sexp
       opt = args.pop if Array === args.last
 
+      argc = args.length - 1
+
       # block name &block
       if args.last.to_s.start_with? '&'
         block_name = args.pop.to_s[1..-1].to_sym
+        argc -= 1
       end
 
       # splat args *splat
       if args.last.to_s.start_with? '*'
         if args.last == :*
           args.pop
+          argc -= 1
         else
           splat = args[-1].to_s[1..-1].to_sym
           args[-1] = splat
-          len = args.length - 2
+          argc -= 1
         end
       end
 
+      args << block_name if block_name # have to re-add incase there was a splat arg
+
       indent do
         in_scope(:def) do
           @scope.mid  = mid
@@ -1064,30 +1054,59 @@ module Opal
           @scope.block_name = yielder
 
           params = process args, :expr
-
-          opt[1..-1].each do |o|
-            next if o[2][2] == :undefined
-            id = process s(:lvar, o[1]), :expr
-            code += ("if (%s == null) {\n%s%s\n%s}" %
-                      [id, @indent + INDENT, process(o, :expre), @indent])
-          end if opt
-
-          code += "#{splat} = __slice.call(arguments, #{len});" if splat
-          code += "\n#@indent" + process(stmts, :stmt)
-
-          # Returns the identity name if identified, nil otherwise
-          scope_name = @scope.identity
+          stmt_code = "\n#@indent" + process(stmts, :stmt)
 
           if @scope.uses_block?
-            # @scope.add_temp '__context'
-            @scope.add_temp yielder
+            # CASE 1: no args - only the block
+            if argc == 0 and !splat
+              # add param name as a function param, to make it cleaner
+              # params = yielder
+              code += "if (typeof(#{yielder}) !== 'function') { #{yielder} = nil }"
+            # CASE 2: we have a splat - use argc to get splat args, then check last one
+            elsif splat
+              @scope.add_temp yielder
+              code += "#{splat} = __slice.call(arguments, #{argc});\n#{@indent}"
+              code += "if (typeof(#{splat}[#{splat}.length - 1]) === 'function') { #{yielder} = #{splat}.pop(); } else { #{yielder} = nil; }\n#{@indent}"
+            # CASE 3: we have some opt args
+            elsif opt
+              code += "var BLOCK_IDX = arguments.length - 1;\n#{@indent}"
+              code += "if (typeof(arguments[BLOCK_IDX]) === 'function' && arguments[BLOCK_IDX]._s !== undefined) { #{yielder} = arguments[BLOCK_IDX] } else { #{yielder} = nil }"
+              lastopt = opt[-1][1]
+              opt[1..-1].each do |o|
+                id = process s(:lvar, o[1]), :expr
+                if o[2][2] == :undefined
+                  code += ("if (%s === %s && typeof(%s) === 'function') { %s = undefined; }" % [id, yielder, id, id])
+                else
+                  code += ("if (%s == null || %s === %s) {\n%s%s\n%s}" %
+                          [id, id, yielder, @indent + INDENT, process(o, :expre), @indent])
+                end
+              end
+
+            # CASE 4: normal args and block
+            else
+              code += "if (typeof(#{yielder}) !== 'function') { #{yielder} = nil }"
+            end
+          else
+            opt[1..-1].each do |o|
+              next if o[2][2] == :undefined
+              id = process s(:lvar, o[1]), :expr
+              code += ("if (%s == null) {\n%s%s\n%s}" %
+                        [id, @indent + INDENT, process(o, :expre), @indent])
+            end if opt
+
+            code += "#{splat} = __slice.call(arguments, #{argc});" if splat          
+          end
 
-            blk = "\n%s%s = %s._p || nil, %s._p = null;\n%s" %
-              [@indent, yielder, scope_name, scope_name, @indent]
+          code += stmt_code
+          # code += "\n#@indent" + process(stmts, :stmt)
 
-            code = blk + code
+          if @scope.uses_block? and !block_name
+            params = params.empty? ? yielder : "#{params}, #{yielder}"
           end
 
+          # Returns the identity name if identified, nil otherwise
+          scope_name = @scope.identity
+
           uses_super = @scope.uses_super
 
           code = "#@indent#{@scope.to_vars}" + code
@@ -1237,7 +1256,7 @@ module Opal
         map = hash_keys.map { |k| "#{k}: #{hash_obj[k]}"}
 
         @helpers[:hash2] = true
-        "__hash2({#{map.join(', ')}})"
+        "__hash2([#{hash_keys.join ', '}], {#{map.join(', ')}})"
       else
         @helpers[:hash] = true
         "__hash(#{sexp.map { |p| process p, :expr }.join ', '})"

data/lib/opal/scope.rb

@@ -86,7 +86,7 @@ module Opal
       end
 
       def proto
-        "#{ @name }_prototype"
+        "def"
       end
       
       def should_donate?
@@ -98,9 +98,10 @@ module Opal
       def to_vars
         vars = @locals.map { |l| "#{l} = nil" }
         vars.push *@temps
+        current_self = @parser.current_self
 
         iv = ivars.map do |ivar|
-         "if (this#{ivar} == null) this#{ivar} = nil;\n"
+         "if (#{current_self}#{ivar} == null) #{current_self}#{ivar} = nil;\n"
         end
 
         indent = @parser.parser_indent
@@ -202,7 +203,7 @@ module Opal
           @parent.uses_block!
         else
           @uses_block = true
-          identify!
+          # identify!
         end
       end
 

data/lib/opal/version.rb

@@ -1,3 +1,3 @@
 module Opal
-  VERSION = '0.3.31'
+  VERSION = '0.3.32'
 end

data/spec/core/array/sort_spec.rb

@@ -0,0 +1,22 @@
+describe "Array#sort and Array#sort!" do
+  it "return new sorted Array if #sort" do
+    a = [2, 7, 5, 9]
+    b = a.sort
+
+    b.should == [2, 5, 7, 9]
+    b.object_id.should_not == a.object_id
+  end
+
+  it "return same sorted Array if #sort!" do
+    a = [2, 7, 5, 9]
+    b = a.sort!
+
+    b.should == [2, 5, 7, 9]
+    b.object_id.should == a.object_id
+  end
+
+  it "#sort and #sort! should support sorting functions" do
+    ["one", "two", "three", "four"].sort {|a , b| a.length  <=> b.length }.should == ["one", "two", "four", "three"]
+    [2, 7, 5, 9].sort! {|a , b| b <=> a }.should == [9, 7, 5, 2]
+  end
+end