opal 0.3.15 → 0.3.16

data/lib/opal/parser/grammar.y

@@ -83,9 +83,13 @@ stmts:
     }
 
 stmt:
-    ALIAS fitem fitem
+    ALIAS fitem
     {
-      result = s(:alias, val[1], val[2])
+      @lex_state = :expr_fname
+    }
+    fitem
+    {
+      result = s(:alias, val[1], val[3])
     }
   | ALIAS GVAR GVAR
     {
@@ -125,7 +129,7 @@ stmt:
     }
   | mlhs '=' command_call
     {
-      result = MlhsAssignNode.new val[1], val[0], val[2]
+      result = s(:masgn, val[0], s(:to_ary, val[2]))
     }
   | var_lhs OP_ASGN command_call
     {
@@ -148,11 +152,11 @@ stmt:
     }
   | mlhs '=' arg_value
     {
-      result = MlhsAssignNode.new val[1], val[0], val[2]
+      result = s(:masgn, val[0], s(:to_ary, val[2]))
     }
   | mlhs '=' mrhs
     {
-      result = MlhsAssignNode.new val[1], val[0], val[2]
+      result = s(:masgn, val[0], val[2])
     }
   | expr
 
@@ -260,16 +264,28 @@ mlhs_entry:
 mlhs_basic:
     mlhs_head
     {
-      result = [val[0]]
+      result = val[0]
     }
   | mlhs_head mlhs_item
     {
-      result = [val[0] << val[1]]
+      result = val[0] << val[1]
     }
   | mlhs_head SPLAT mlhs_node
+    {
+      result = val[0] << s(:splat, val[2])
+    }
   | mlhs_head SPLAT
+    {
+      result = val[0] << s(:splat)
+    }
   | SPLAT mlhs_node
+    {
+      result = s(:array, s(:splat, val[1]))
+    }
   | SPLAT
+    {
+      result = s(:array, s(:splat))
+    }
 
 mlhs_item:
     mlhs_node
@@ -284,7 +300,7 @@ mlhs_item:
 mlhs_head:
     mlhs_item ','
     {
-      result = [val[0]]
+      result = s(:array, val[0])
     }
   | mlhs_head mlhs_item ','
     {
@@ -293,6 +309,9 @@ mlhs_head:
 
 mlhs_node:
     variable
+    {
+      result = new_assignable val[0]
+    }
   | primary_value '[@' aref_args ']'
   | primary_value '.' IDENTIFIER
   | primary_value '::' IDENTIFIER

data/lib/opal/parser/lexer.rb

@@ -539,7 +539,7 @@ module Opal
       #puts "matced beg balance!"
       str_buffer << scanner.matched
       str_parse[:nesting] += 1
-    elsif scanner.check(/#[$@]/)
+    elsif scanner.check(/#[@$]/)
       scanner.scan(/#/)
       if interpolate
         return :STRING_DVAR, scanner.matched
@@ -562,6 +562,7 @@ module Opal
 
     add_string_content str_buffer, str_parse
     complete_str = str_buffer.join ''
+    @line += complete_str.count("\n")
     return :STRING_CONTENT, complete_str
   end
 
@@ -600,7 +601,7 @@ module Opal
         scanner.pos -= 1
         break
 
-      elsif interpolate && scanner.check(/#(?=[\@\{])/)
+      elsif interpolate && scanner.check(/#(?=[\$\@\{])/)
         break
 
       #elsif scanner.scan(/\\\\/)
@@ -925,6 +926,14 @@ module Opal
             @lex_state = :expr_end
             return '<<', '<<'
           elsif ![:expr_end, :expr_dot, :expr_endarg, :expr_class].include?(@lex_state) && space_seen
+            if scanner.scan(/(-?)(\w+)/)
+              heredoc = scanner[2]
+              # for now just scrap rest of line + skip down one line for
+              # string content
+              scanner.scan(/.*\n/)
+              @string_parse = { :beg => heredoc, :end => heredoc, :interpolate => true }
+              return :STRING_BEG, heredoc
+            end
             @lex_state = :expr_beg
             return '<<', '<<'
           end
@@ -1292,7 +1301,7 @@ module Opal
           return :YIELD, matched
 
         when 'alias'
-          @lex_state = :expr_arg
+          @lex_state = :expr_fname
           return :ALIAS, matched
         end
 

data/lib/opal/parser/parser.rb

@@ -85,17 +85,23 @@ module Opal
     def parse(source, file = '(file)')
       @file = file
       @helpers = {
-        :breaker => true, :no_proc => true, :klass => true, :defn => true, :defs => true, :const_get => true,
+        :breaker => true, :no_proc => true, :klass => true, :const_get => true,
         :slice => true
       }
 
       parser = Grammar.new
       reset
 
+      # Debug mode always uses FILE for sending methods which have stack traces
+      @uses_file = true if @debug
+
+      # $send is needed in debug mode
+      @helpers[:send] = true if @debug
+
       begin
         top parser.parse(source, file)
       rescue Exception => e
-        raise OpalParseError.new("#{e.message}\nfrom parsing #{file}:#{parser.line}")
+        raise OpalParseError.new("#{e.message} in #{file}:#{parser.line}")
       end
     end
 
@@ -112,7 +118,7 @@ module Opal
     end
 
     def mid_to_jsid(mid)
-      'm$' + if name = METHOD_NAMES[mid.to_sym]
+      '$' + if name = METHOD_NAMES[mid.to_sym]
         name + '$'
       else
         mid.sub('!', '$b').sub('?', '$p').sub('=', '$e')
@@ -166,7 +172,7 @@ module Opal
 
       @scope = parent
     end
-    
+
     def indent(&block)
       indent = @indent
       @indent += INDENT
@@ -315,7 +321,7 @@ module Opal
 
       res = "(#{a} = #{l}, #{b} = #{r}, typeof(#{a}) === "
       res += "'number' ? #{a} #{meth} #{b} : #{a}.#{mid}"
-      res += "(null, #{b}))"
+      res += "(#{b}))"
 
       @scope.queue_temp a
       @scope.queue_temp b
@@ -464,9 +470,13 @@ module Opal
       args ||= s(:masgn, s(:array))
       args = args.first == :lasgn ? s(:array, args) : args[1]
 
+      if args.last[0] == :block_pass
+        args.pop
+      end
+
       if args.last[0] == :splat
-        splat = args[-1][1][1]
-        args[-1] = s(:lasgn, splat)
+        splat = args.last[1][1]
+        args.pop
         len = args.length
       end
 
@@ -479,8 +489,12 @@ module Opal
           end
 
           params = js_block_args(args[1..-1])
-          params.unshift '_$'
-          code += "#{splat} = $slice.call(arguments, #{len - 1});" if splat
+
+          if splat
+            params << splat
+            code += "#{splat} = $slice.call(arguments, #{len - 1});"
+          end
+
           code += process body, :statement
 
           code = @scope.to_vars + code
@@ -532,29 +546,55 @@ module Opal
 
       if Sexp === arglist.last and arglist.last.first == :block_pass
         tmpproc = @scope.new_temp
-        arglist.insert 1, s(:js_tmp, process(arglist.pop, :expression))
+        tmprecv = @scope.new_temp
+        block = process arglist.pop, :expression
       elsif iter
         tmpproc = @scope.new_temp
-        arglist.insert 1, s(:js_tmp, "(#{tmpproc}=#{iter},#{tmpproc}.$S=this,#{tmpproc})")
-      else
-        arglist.insert 1, s(:js_tmp, 'null') unless arglist.length == 1
+        tmprecv = @scope.new_temp
+        block = iter
+      elsif splat or @debug
+        tmprecv = @scope.new_temp
       end
 
-      tmprecv = @scope.new_temp if splat or @debug
       args = ""
 
       recv_code = recv.nil? ? 'this' : process(recv, :receiver)
 
+      if @debug
+        if iter
+          debugblock = "(#{tmpproc}=#{block},#{tmpproc}.$S=this, #{tmpproc})"
+        elsif block
+          debugblock = block
+        else
+          debugblock = 'null'
+        end
+        arglist.insert 1, s(:js_tmp, recv_code), s(:js_tmp, debugblock), s(:js_tmp, mid.inspect)
+      end
+
       args = process arglist, :expression
 
       @scope.queue_temp tmprecv if tmprecv
       @scope.queue_temp tmpproc if tmpproc
 
       if @debug
+        splat ? "$send.apply(null, #{args})" : "$send(#{args})"
+      elsif @method_missing
         pre = "((#{tmprecv}=#{recv_code}).#{mid} || $opal.mm('#{mid}'))."
         splat ? "#{pre}apply(#{tmprecv}, #{args})" : "#{pre}call(#{tmprecv}#{args == '' ? '' : ", #{args}"})"
       else
-        splat ? "(#{tmprecv}=#{recv_code}).#{mid}.apply(#{tmprecv}, #{args})" : "#{recv_code}.#{mid}(#{args})"
+        if block
+          if iter
+            call = "(#{tmpproc}=(#{tmprecv}=#{recv_code}).#{mid}, (#{tmpproc}.$P = #{block}).$S = this, #{tmpproc})"
+          else # block_pass
+            call = "(#{tmpproc}=(#{tmprecv}=#{recv_code}).#{mid}, #{tmpproc}.$P = #{block}, #{tmpproc})"
+          end
+
+          args = ", #{args}" unless args.empty?
+          splat ? "#{call}.apply(#{tmprecv}#{args})" : "#{call}.call(#{tmprecv}#{args})"
+
+        else
+          splat ? "(#{tmprecv}=#{recv_code}).#{mid}.apply(#{tmprecv}, #{args})" : "#{recv_code}.#{mid}(#{args})"
+        end
       end
     end
 
@@ -704,16 +744,16 @@ module Opal
       mid = mid_to_jsid mid.to_s
 
       if recvr
-        type = '$defs'
+        type = '$opal.defs'
         recv = process(recvr, :expression)
       else
-        type = '$defn'
+        type = '$opal.defn'
         recv = 'this'
       end
 
       code = ''
       params = nil
-      scope_name = @scope.name
+      scope_name = nil
 
       # opt args if last arg is sexp
       opt = args.pop if Sexp === args.last
@@ -734,11 +774,10 @@ module Opal
         end
       end
 
-      aritycode = arity_check(args, opt, splat) if @debug
+      aritycode = arity_check(args, opt, splat) if @debug && false
 
       indent do
       in_scope(:def) do
-        args.insert 1, '$yield'
         params = process args, :expression
 
         if block_name
@@ -747,18 +786,26 @@ module Opal
         end
 
         opt[1..-1].each do |o|
+          next if o[2][2] == :undefined
           id = process s(:lvar, o[1]), :expression
           code += "if (#{id} === undefined) { #{process o, :expression}; }"
         end if opt
 
-        code += "#{splat} = $slice.call(arguments, #{len + 1});" if splat
+        code += "#{splat} = $slice.call(arguments, #{len});" if splat
         code += process(stmts, :statement)
 
         if @scope.uses_block?
-          blk = "$yield || ($yield = $no_proc);"
-          blk = "var #{block_name} = $yield || ($yield = $no_proc, nil);" if block_name
-          blk += "var $context = $yield.$S;"
-          blk = "var $block_given = ($yield != null); #{blk}"
+          scope_name = @scope.name = unique_temp
+          blk = "var $yield = #{scope_name}.$P;"
+          blk += "if ($yield) { var $context = $yield.$S"
+          blk += ", $block_given = true"
+          blk += ", #{block_name} = $yield" if block_name
+          blk += "; #{scope_name}.$P = null; }"
+
+          blk += "else { $yield = $no_proc"
+          blk += ", #{block_name} = nil" if block_name
+          blk += "; }"
+
           code = blk + code
         end
 
@@ -774,14 +821,16 @@ module Opal
 
       defcode = "#{"#{scope_name} = " if scope_name}function(#{params}) {#{code}#{fix_line end_line}}"
 
-      if recvr
+      if @debug
+        "#{type}(#{recv}, '#{mid}', #{defcode}, FILE, #{line})"
+      elsif recvr
         "#{type}(#{recv}, '#{mid}', #{defcode})"
       elsif @scope.type == :class
         @scope.methods << mid if @scope.donates_methods
-        "$proto.#{mid} = #{defcode}"
+        "def.#{mid} = #{defcode}"
       elsif @scope.type == :module
         @scope.methods << mid
-        "$proto.#{mid} = #{defcode}"
+        "def.#{mid} = #{defcode}"
       else
         "#{type}(#{recv}, '#{mid}', #{defcode})"
       end
@@ -865,7 +914,7 @@ module Opal
 
     # s(:hash, key1, val1, key2, val2...)
     def hash(sexp, level)
-      "(new $opal.hash(#{sexp.map { |p| process p, :expression }.join ', '}))"
+      "$opal.hash(#{sexp.map { |p| process p, :expression }.join ', '})"
     end
 
     # s(:while, exp, block, true)
@@ -951,6 +1000,45 @@ module Opal
       "$opal.alias(this, #{process new, :expression}, #{process old, :expression})"
     end
 
+    def masgn(sexp, level)
+      lhs = sexp[0]
+      rhs = sexp[1]
+      tmp = @scope.new_temp
+      len = 0
+
+      # remote :array part
+      lhs.shift
+      if rhs[0] == :array
+        len = rhs.length - 1 # we are guaranteed an array of this length
+        code  = ["#{tmp} = #{process rhs, :expression}"]
+      elsif rhs[0] == :to_ary
+        code = ["#{tmp} = [#{process rhs[1], :expression}]"]
+      elsif rhs[0] == :splat
+        code = ["#{tmp} = #{process rhs[1], :expression}"]
+      else
+        raise "Unsupported mlhs type"
+      end
+
+      lhs.each_with_index do |l, idx|
+
+        if l.first == :splat
+          s = l[1]
+          s << s(:js_tmp, "$slice.call(#{tmp}, #{idx})")
+          code << process(s, :expression)
+        else
+          if idx >= len
+            l << s(:js_tmp, "(#{tmp}[#{idx}] === undefined ? nil : #{tmp}[#{idx}])")
+          else
+            l << s(:js_tmp, "#{tmp}[#{idx}]")
+          end
+          code << process(l, :expression)
+        end
+      end
+
+      @scope.queue_temp tmp
+      code.join ', '
+    end
+
     def svalue(sexp, level)
       process sexp.shift, level
     end
@@ -1180,7 +1268,6 @@ module Opal
     def yield(sexp, level)
       @scope.uses_block!
       splat = sexp.any? { |s| s.first == :splat }
-      sexp.unshift s(:js_tmp, 'null')
       sexp.unshift s(:js_tmp, '$context') unless splat
       args = arglist(sexp, level)
 

data/lib/opal/parser/scope.rb

@@ -40,10 +40,10 @@ module Opal; class Parser
 
       if @type == :class
         vars << '$const = this.$const'
-        vars << '$proto = this.$proto'
+        vars << 'def = this.$proto'
       elsif @type == :module
         vars << '$const = this.$const'
-        vars << '$proto = this.$proto'
+        vars << 'def = this.$proto'
       elsif @type == :sclass
         vars << '$const = this.$const'
       end

data/lib/opal/version.rb

@@ -1,4 +1,4 @@
 module Opal
-  VERSION = "0.3.15"
+  VERSION = "0.3.16"
 end
 

data/opal.gemspec

@@ -1,14 +1,12 @@
-# coding: utf-8
-$:.push File.expand_path('../lib', __FILE__)
-require 'opal'
-require 'opal/version'
+# -*- encoding: utf-8 -*-
+require File.expand_path('../lib/opal/version', __FILE__)
 
 Gem::Specification.new do |s|
   s.name         = 'opal'
   s.version      = Opal::VERSION
   s.author       = 'Adam Beynon'
   s.email        = 'adam@adambeynon.com'
-  s.homepage     = 'http://opalscript.org'
+  s.homepage     = 'http://opalrb.org'
   s.summary      = 'Ruby runtime and core library for javascript'
   s.description  = 'Ruby runtime and core library for javascript.'
 
@@ -17,7 +15,4 @@ Gem::Specification.new do |s|
   s.executables    = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.test_files     = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths  = ['lib']
-
-  s.add_development_dependency 'racc'
-  s.add_development_dependency 'therubyracer'
 end