opal 0.3.27 → 0.3.28

data/core/json.rb

@@ -38,12 +38,13 @@ 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]);
-                map[k] = [k, v];
+                keys.push(k);
+                map[k] = v;
               }
             }
           }

data/core/kernel.rb

@@ -11,6 +11,23 @@ module Kernel
     `#{self} == other`
   end
 
+  def methods(all = true)
+    %x{
+      var methods = [];
+      for(var k in #{self}) {
+        if(k[0] == "$" && typeof (#{self})[k] === "function") {
+          if(all === #{false} || all === #{nil}) {
+            if(!Object.hasOwnProperty.call(#{self}, k)) {
+              continue;
+            }
+          }
+          methods.push(k.substr(1));
+        }
+      }
+      return methods;
+    }
+  end
+
   def __send__(symbol, *args, &block)
     %x{
       return #{self}['$' + symbol].apply(#{self}, args);
@@ -32,32 +49,6 @@ module Kernel
     }
   end
 
-  def attribute_get(name)
-    %x{
-      var meth = '$' + name;
-      if (#{self}[meth]) {
-        return #{self}[meth]();
-      }
-
-      meth += '?';
-      if (#{self}[meth]) {
-        return #{self}[meth]()
-      }
-
-      return nil;
-    }
-  end
-
-  def attribute_set(name, value)
-  %x{
-    if (#{self}['$' + name + '=']) {
-      return #{self}['$' + name + '='](value);
-    }
-
-    return nil;
-  }
-  end
-
   def class
     `return #{self}._klass`
   end
@@ -103,7 +94,7 @@ module Kernel
     to_s
   end
 
-  def instance_eval(string=undefined, &block)
+  def instance_eval(&block)
     %x{
       if (block === nil) {
         no_block_given();
@@ -206,12 +197,21 @@ module Kernel
   def puts(*strs)
     %x{
       for (var i = 0; i < strs.length; i++) {
-        __opal.puts(#{ `strs[i]`.to_s });
+        if(strs[i] instanceof Array) {
+          #{ puts *strs }
+        } else {
+          __opal.puts(#{ `strs[i]`.to_s });
+        }
       }
     }
     nil
   end
 
+  def p(*args)
+    `console.log.apply(console, args);`
+    args.length <= 1 ? args[0] : args
+  end
+
   alias print puts
 
   def raise(exception, string)

data/core/numeric.rb

@@ -161,7 +161,7 @@ class Numeric < `Number`
 
   def times(&block)
     %x{
-      for (var i = 0; i <= #{self}; i++) {
+      for (var i = 0; i < #{self}; i++) {
         if (block.call(__context, i) === __breaker) {
           return __breaker.$v;
         }
@@ -189,7 +189,7 @@ class Numeric < `Number`
 
   def upto(finish, &block)
     %x{
-      for (var i = 0; i <= finish; i++) {
+      for (var i = #{self}; i <= finish; i++) {
         if (block.call(__context, i) === __breaker) {
           return __breaker.$v;
         }

data/core/runtime.js

@@ -89,7 +89,6 @@ Opal.module = function(base, id, constructor) {
     klass = boot_class(Class, constructor);
     klass._name = (base === Object ? id : base._name + '::' + id);
 
-    klass._isModule = true;
     klass.$included_in = [];
 
     var const_alloc   = function() {};

data/lib/opal.rb

@@ -28,11 +28,13 @@ module Opal
     core_dir   = Opal.core_dir
     load_order = File.join core_dir, 'load_order'
     corelib    = File.read(load_order).strip.split.map do |c|
-      File.read File.join(core_dir, "#{c}.rb")
+      file = File.join(core_dir, "#{c}.rb")
+      source = File.read file
+      Opal.parse source, file
     end
 
     runtime = File.read(File.join core_dir, 'runtime.js')
-    corelib = Opal.parse corelib.join("\n"), '(corelib)'
+    corelib = corelib.join("\n")
 
     [
       "// Opal v#{Opal::VERSION}",

data/lib/opal/grammar.rb

@@ -2091,7 +2091,7 @@ racc_reduce_table = [
   1, 186, :_reduce_none,
   0, 219, :_reduce_253,
   4, 186, :_reduce_254,
-  4, 186, :_reduce_none,
+  4, 186, :_reduce_255,
   3, 186, :_reduce_256,
   3, 186, :_reduce_257,
   2, 186, :_reduce_258,
@@ -3817,7 +3817,11 @@ def _reduce_254(val, _values, result)
     result
 end
 
-# reduce 255 omitted
+def _reduce_255(val, _values, result)
+      result = val[1]
+    
+    result
+end
 
 def _reduce_256(val, _values, result)
       result = val[1] || s(:nil)

data/lib/opal/grammar.y

@@ -729,6 +729,9 @@ primary:
       result.line = val[1]
     }
   | tLPAREN_ARG expr opt_nl ')'
+    {
+      result = val[1]
+    }
   | PAREN_BEG compstmt ')'
     {
       result = val[1] || s(:nil)

data/lib/opal/lexer.rb

@@ -7,10 +7,6 @@ class Array
 end
 
 module Opal
-  Sexp = ::Array
-
-  # Any exceptions with parsing of file will raise this error
-  class OpalParseError < Exception; end
 
   class Grammar < Racc::Parser
 
@@ -27,7 +23,7 @@ module Opal
     end
 
     def s(*parts)
-      sexp = Sexp.new(parts)
+      sexp = Array.new(parts)
       sexp.line = @line
       sexp
     end
@@ -43,7 +39,7 @@ module Opal
     end
 
     def on_error(t, val, vstack)
-      raise OpalParseError, "parse error on value #{val.inspect} (line #{@line})"
+      raise "parse error on value #{val.inspect} :#{@file}:#{@line}"
     end
 
     class LexerScope
@@ -731,6 +727,11 @@ module Opal
             return :OP_ASGN, '/'
           elsif @lex_state == :expr_fname
             @lex_state = :expr_end
+          elsif @lex_state == :expr_cmdarg || @lex_state == :expr_arg
+            if !scanner.check(/\s/) && space_seen
+              @string_parse = { :beg => '/', :end => '/', :interpolate => true, :regexp => true }
+              return :REGEXP_BEG, scanner.matched
+            end
           end
 
           return '/', '/'
@@ -747,7 +748,9 @@ module Opal
           result = scanner.matched
           if [:expr_beg, :expr_mid].include? @lex_state
             result = :PAREN_BEG
-          elsif space_seen
+          elsif space_seen && [:expr_arg, :expr_cmdarg].include?(@lex_state)
+            result = :tLPAREN_ARG
+          else
             result = '('
           end
 
@@ -979,7 +982,7 @@ module Opal
             return '>=', scanner.matched
           elsif scanner.scan(/\>/)
             if @lex_state == :expr_fname
-              @lex_state = :expr_end
+              @lex_state = :expr_arg
             else
               @lex_state = :expr_beg
             end
@@ -987,7 +990,8 @@ module Opal
           end
 
         elsif scanner.scan(/->/)
-          @lex_state = :expr_arg
+          # FIXME: # should be :expr_arg, but '(' breaks it...
+          @lex_state = :expr_end
           @start_of_lambda = true
           return [:LAMBDA, scanner.matched]
 
@@ -1009,6 +1013,13 @@ module Opal
             return [:OP_ASGN, result]
           end
 
+          if @lex_state == :expr_cmdarg || @lex_state == :expr_arg
+            if !scanner.check(/\s/) && space_seen
+              @lex_state = :expr_mid
+              return [sign, sign]
+            end
+          end
+
           @lex_state = :expr_beg
           return [result, result]
 
@@ -1019,6 +1030,10 @@ module Opal
             return '?', scanner.matched
           end
 
+          unless scanner.check(/\ |\t|\r/)
+            @lex_state = :expr_end
+            return :STRING, scanner.scan(/./)
+          end
           #if scanner.scan(/\\/)
             #c = if scanner.scan(/n/)
                   #"\n"
@@ -1367,7 +1382,7 @@ module Opal
         end
         return [false, false] if scanner.eos?
 
-        raise OpalParseError, "Unexpected content in parsing stream `#{scanner.peek 5}`"
+        raise "Unexpected content in parsing stream `#{scanner.peek 5}` :#{@file}:#{@line}"
       end
     end
   end

data/lib/opal/parser.rb

@@ -129,7 +129,7 @@ module Opal
     #
     # @result [Array]
     def s(*parts)
-      sexp = Sexp.new(parts)
+      sexp = Array.new(parts)
       sexp.line = @line
       sexp
     end
@@ -339,6 +339,7 @@ module Opal
         sexp[0] = :returnable_yield
         sexp
       when :scope
+        sexp[1] = returns sexp[1]
         sexp
       when :block
         if sexp.length > 1
@@ -350,6 +351,9 @@ module Opal
       when :when
         sexp[2] = returns(sexp[2])
         sexp
+      when :rescue
+        sexp[1] = returns sexp[1]
+        sexp
       when :ensure
         sexp[1] = returns sexp[1]
         sexp
@@ -387,13 +391,13 @@ module Opal
     end
 
     # More than one expression in a row will be grouped by the grammar
-    # into a block sexp. A block sexp just holds any number of other 
+    # into a block sexp. A block sexp just holds any number of other
     # sexps.
     #
     #     s(:block, s(:str, "hey"), s(:lit, 42))
     #
     # A block can actually be empty. As opal requires real values to
-    # be returned (to appease javascript values), a nil sexp 
+    # be returned (to appease javascript values), a nil sexp
     # s(:nil) will be generated if the block is empty.
     #
     # @return [String]
@@ -423,7 +427,7 @@ module Opal
     # generated as a top level member. This is because if a yield
     # is returned by a break statement, then the method must return.
     #
-    # As inline expressions in javascript cannot return, the block 
+    # As inline expressions in javascript cannot return, the block
     # must be rewritten.
     #
     # For example, a yield inside an array:
@@ -470,7 +474,7 @@ module Opal
     def process_scope(sexp, level)
       stmt = sexp.shift
       if stmt
-        stmt = returns stmt unless @scope.donates_methods
+        stmt = returns stmt unless @scope.class_scope?
         code = process stmt, :stmt
       else
         code = "nil"
@@ -506,7 +510,11 @@ module Opal
 
     def js_block_given(sexp, level)
       @scope.uses_block!
-      "(#{@scope.block_name} !== nil)"
+      if @scope.block_name
+        "(#{@scope.block_name} !== nil)"
+      else
+        "false"
+      end
     end
 
     def handle_block_given(sexp, reverse = false)
@@ -601,8 +609,11 @@ module Opal
 
     # s(:not, sexp)
     def process_not(sexp, level)
-      code = "!#{process sexp.shift, :expr}"
-      code
+      with_temp do |tmp|
+        "(#{tmp} = #{process(sexp.shift, :expr)}, (#{tmp} === nil || #{tmp} === false))"
+      end
+      # code = "!#{process sexp.shift, :expr}"
+      # code
     end
 
     def process_block_pass(exp, level)
@@ -736,7 +747,7 @@ module Opal
         end
       end
 
-      out.join ", \n#@indent"
+      out.join(", \n#@indent") + ', nil'
     end
 
     def handle_alias_native(sexp)
@@ -782,7 +793,7 @@ module Opal
 
       splat = arglist[1..-1].any? { |a| a.first == :splat }
 
-      if Sexp === arglist.last and arglist.last.first == :block_pass
+      if Array === arglist.last and arglist.last.first == :block_pass
         block   = process s(:js_tmp, process(arglist.pop, :expr)), :expr
       elsif iter
         block   = iter
@@ -795,7 +806,7 @@ module Opal
       elsif splat and recv != [:self] and recv[0] != :lvar
         tmprecv = @scope.new_temp
       end
-      
+
       args      = ""
 
       recv_code = process recv, :recv
@@ -893,19 +904,33 @@ module Opal
         in_scope(:class) do
           @scope.name = name
           @scope.add_temp "#{ @scope.proto } = #{name}.prototype", "__scope = #{name}._scope"
-          @scope.donates_methods = true
+
+          if Array === body.last
+            # A single statement will need a block
+            needs_block = body.last.first != :block
+            body.last.first == :block
+            last_body_statement = needs_block ? body.last : body.last.last
+
+            if last_body_statement and Array === last_body_statement
+              if [:defn, :defs].include? last_body_statement.first
+                body[-1] = s(:block, body[-1]) if needs_block
+                body.last << s(:nil)
+              end
+            end
+          end
+
+          body = returns(body)
           body = process body, :stmt
-          code = @indent + @scope.to_vars + "\n\n#@indent" + body
-          code += "\n#{@scope.to_donate_methods}"
+          code = "\n#{@scope.to_donate_methods}"
+          code += @indent + @scope.to_vars + "\n\n#@indent" + body
         end
       end
 
       spacer  = "\n#{@indent}#{INDENT}"
       cls     = "function #{name}() {};"
       boot    = "#{name} = __klass(__base, __super, #{name.inspect}, #{name});"
-      comment = "#{spacer}// line #{ sexp.line }, #{ @file }, class #{ name }"
 
-      "(function(__base, __super){#{comment}#{spacer}#{cls}#{spacer}#{boot}\n#{code}\n#{@indent}})(#{base}, #{sup})"
+      "(function(__base, __super){#{spacer}#{cls}#{spacer}#{boot}\n#{code}\n#{@indent}})(#{base}, #{sup})"
     end
 
     # s(:sclass, recv, body)
@@ -948,7 +973,6 @@ module Opal
         in_scope(:module) do
           @scope.name = name
           @scope.add_temp "#{ @scope.proto } = #{name}.prototype", "__scope = #{name}._scope"
-          @scope.donates_methods = true
           body = process body, :stmt
           code = @indent + @scope.to_vars + "\n\n#@indent" + body + "\n#@indent" + @scope.to_donate_methods
         end
@@ -957,9 +981,8 @@ module Opal
       spacer  = "\n#{@indent}#{INDENT}"
       cls     = "function #{name}() {};"
       boot    = "#{name} = __module(__base, #{name.inspect}, #{name});"
-      comment = "#{spacer}// line #{ sexp.line }, #{ @file }, module #{ name }"
 
-      "(function(__base){#{comment}#{spacer}#{cls}#{spacer}#{boot}\n#{code}\n#{@indent}})(#{base})"
+      "(function(__base){#{spacer}#{cls}#{spacer}#{boot}\n#{code}\n#{@indent}})(#{base})"
     end
 
     def process_undef(exp, level)
@@ -1008,7 +1031,7 @@ module Opal
       uses_super = nil
 
       # opt args if last arg is sexp
-      opt = args.pop if Sexp === args.last
+      opt = args.pop if Array === args.last
 
       # block name &block
       if args.last.to_s.start_with? '&'
@@ -1071,18 +1094,10 @@ module Opal
 
       defcode = "#{"#{scope_name} = " if scope_name}function(#{params}) {\n#{code}\n#@indent}"
 
-      comment = "// line #{line}, #{@file}"
-
-      if @scope.class_scope? 
-        comment += ", #{ @scope.name }#{ recvr ? '.' : '#' }#{ mid }"
-      end
-
-      comment += "\n#{@indent}"
-
       if recvr
         if smethod
           @scope.smethods << "$#{mid}"
-          "#{ comment }#{ @scope.name }#{jsid} = #{defcode}"
+          "#{ @scope.name }#{jsid} = #{defcode}"
         else
           "#{ recv }#{ jsid } = #{ defcode }"
         end
@@ -1092,7 +1107,7 @@ module Opal
           @scope.add_temp uses_super
           uses_super = "#{uses_super} = #{@scope.proto}#{jsid};\n#@indent"
         end
-        "#{ comment }#{uses_super}#{ @scope.proto }#{jsid} = #{defcode}"
+        "#{uses_super}#{ @scope.proto }#{jsid} = #{defcode}"
       elsif @scope.type == :iter
         "def#{jsid} = #{defcode}"
       elsif @scope.type == :top
@@ -1195,8 +1210,34 @@ module Opal
 
     # s(:hash, key1, val1, key2, val2...)
     def process_hash(sexp, level)
-      @helpers[:hash] = true
-      "__hash(#{sexp.map { |p| process p, :expr }.join ', '})"
+      keys = []
+      vals = []
+
+      sexp.each_with_index do |obj, idx|
+        if idx.even?
+          keys << obj
+        else
+          vals << obj
+        end
+      end
+
+      if keys.all? { |k| [:lit, :str].include? k[0] }
+        hash_obj  = {}
+        hash_keys = []
+        keys.size.times do |i|
+          k = process(keys[i], :expr)
+          hash_keys << k unless hash_obj.include? k
+          hash_obj[k] = process(vals[i], :expr)
+        end
+
+        map = hash_keys.map { |k| "#{k}: #{hash_obj[k]}"}
+
+        @helpers[:hash2] = true
+        "__hash2([#{hash_keys.join ', '}], {#{map.join(', ')}})"
+      else
+        @helpers[:hash] = true
+        "__hash(#{sexp.map { |p| process p, :expr }.join ', '})"
+      end
     end
 
     # s(:while, exp, block, true)
@@ -1862,7 +1903,7 @@ module Opal
       }.join ', '
       err = "true" if err.empty?
 
-      if Sexp === args.last and [:lasgn, :iasgn].include? args.last.first
+      if Array === args.last and [:lasgn, :iasgn].include? args.last.first
         val = args.last
         val[2] = s(:js_tmp, "$err")
         val = process(val, :expr) + ";"
@@ -1895,4 +1936,4 @@ module Opal
       end
     end
   end
-end
+end