opal 0.10.6 → 0.11.0.rc1

data/lib/opal/nodes/logic.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'opal/nodes/base'
 
 module Opal
@@ -5,13 +6,24 @@ module Opal
     class NextNode < Base
       handle :next
 
-      children :value
-
       def compile
-        return push "continue;" if in_while?
+        if in_while?
+          push "continue;"
+        else
+          push expr_or_nil(value)
+          wrap "return ", ";"
+        end
+      end
 
-        push expr_or_nil(value)
-        wrap "return ", ";"
+      def value
+        case children.size
+        when 0
+          s(:nil)
+        when 1
+          children.first
+        else
+          s(:array, *children)
+        end
       end
     end
 
@@ -40,15 +52,13 @@ module Opal
 
       def compile_iter
         error "break must be used as a statement" unless stmt?
-        compiler.has_break!
+
         line 'Opal.brk(', break_val, ', $brk)'
       end
 
       def break_val
         if value.nil?
           expr(s(:nil))
-        elsif children.size > 1
-          expr(s(:array, *children))
         else
           expr(value)
         end
@@ -78,33 +88,18 @@ module Opal
       end
     end
 
-    class NotNode < Base
-      handle :not
-
-      children :value
-
-      def compile
-        with_temp do |tmp|
-          push expr(value)
-          wrap "(#{tmp} = ", ", (#{tmp} === nil || #{tmp} === false || #{tmp} == null))"
-        end
-      end
-    end
-
     class SplatNode < Base
       handle :splat
 
       children :value
 
       def empty_splat?
-        value == [:nil] or value == [:paren, [:nil]]
+        value == s(:array)
       end
 
       def compile
         if empty_splat?
           push '[]'
-        elsif value.type == :sym
-          push '[', expr(value), ']'
         else
           push "Opal.to_a(", recv(value), ")"
         end
@@ -270,7 +265,7 @@ module Opal
       children :value
 
       def compile
-        push expr(s(:call, value, :to_proc, s(:arglist)))
+        push expr(s(:send, value, :to_proc, s(:arglist)))
       end
     end
   end

data/lib/opal/nodes/masgn.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
 require 'opal/nodes/base'
 
 module Opal
   module Nodes
     class MassAssignNode < Base
-      SIMPLE_ASSIGNMENT = [:lasgn, :iasgn, :lvar, :gasgn, :cdecl]
+      SIMPLE_ASSIGNMENT = [:lvasgn, :ivasgn, :lvar, :gvasgn, :cdecl, :casgn]
 
       handle :masgn
       children :lhs, :rhs
@@ -13,21 +14,23 @@ module Opal
 
         if rhs.type == :array
           push "#{array} = ", expr(rhs)
-          compile_masgn(lhs.children, array, rhs.size - 1)
+          rhs_len = rhs.children.any? { |c| c.type == :splat } ? nil : rhs.children.size
+          compile_masgn(lhs.children, array, rhs_len)
           push ", #{array}" # a mass assignment evaluates to the RHS
-        elsif rhs.type == :to_ary
+        elsif rhs.type == :begin
           retval = scope.new_temp
-          push "#{retval} = ", expr(rhs[1])
+          push "#{retval} = ", expr(rhs)
           push ", #{array} = Opal.to_ary(#{retval})"
           compile_masgn(lhs.children, array)
           push ", #{retval}"
           scope.queue_temp(retval)
-        elsif rhs.type == :splat
-          push "#{array} = Opal.to_a(", expr(rhs[1]), ")"
-          compile_masgn(lhs.children, array)
-          push ", #{array}"
         else
-          raise "unsupported mlhs type"
+          retval = scope.new_temp
+          push "#{retval} = ", expr(rhs)
+          push ", #{array} = Opal.to_ary(#{retval})"
+          compile_masgn(lhs.children, array)
+          push ", #{retval}"
+          scope.queue_temp(retval)
         end
 
         scope.queue_temp(array)
@@ -46,7 +49,7 @@ module Opal
           splat = post_splat.shift
 
           if post_splat.empty? # trailing splat
-            if part = splat[1]
+            if part = splat.children[0]
               part = part.dup << s(:js_tmp, "$slice.call(#{array}, #{pre_splat.size})")
               push ', '
               push expr(part)
@@ -56,7 +59,7 @@ module Opal
             push ", #{tmp} = #{array}.length - #{post_splat.size}"
             push ", #{tmp} = (#{tmp} < #{pre_splat.size}) ? #{pre_splat.size} : #{tmp}"
 
-            if part = splat[1]
+            if part = splat.children[0]
               part = part.dup << s(:js_tmp, "$slice.call(#{array}, #{pre_splat.size}, #{tmp})")
               push ', '
               push expr(part)
@@ -82,18 +85,17 @@ module Opal
           assign = s(:js_tmp, "#{array}[#{idx}]")
         end
 
-        part = child.dup
+        part = child.updated
         if SIMPLE_ASSIGNMENT.include?(child.type)
-          part << assign
-        elsif child.type == :call
-          part[2] = "#{part[2]}=".to_sym
-          part.last << assign
+          part = part.updated(nil, part.children + [assign])
+        elsif child.type == :send
+          part = part.updated(nil, part.children + [assign])
         elsif child.type == :attrasgn
           part.last << assign
-        elsif child.type == :array
+        elsif child.type == :mlhs
           # nested destructuring
           tmp = scope.new_temp
-          push ", (#{tmp} = Opal.to_ary(#{assign[1]})"
+          push ", (#{tmp} = Opal.to_ary(#{assign.children[0]})"
           compile_masgn(child.children, tmp)
           push ')'
           scope.queue_temp(tmp)

data/lib/opal/nodes/module.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'opal/nodes/scope'
 
 module Opal
@@ -11,13 +12,13 @@ module Opal
         name, base = name_and_base
         helper :module
 
-        push "(function($base) {"
+        push "(function($base, $parent_nesting) {"
         line "  var $#{name}, self = $#{name} = $module($base, '#{name}');"
 
         in_scope do
           scope.name = name
           add_temp "#{scope.proto} = self.$$proto"
-          add_temp '$scope = self.$$scope'
+          add_temp '$nesting = [self].concat($parent_nesting)'
 
           body_code = stmt(body || s(:nil))
           empty_line
@@ -26,19 +27,17 @@ module Opal
           line body_code
         end
 
-        line "})(", base, ")"
+        line "})(", base, ", $nesting)"
       end
 
+      # cid is always s(:const, scope_sexp_or_nil, :ConstName)
       def name_and_base
-        if cid.type == :const
-          # Using $scope.base, not self in case a class is created inside an anonymous class or block
-          [cid[1].to_s, '$scope.base']
-        elsif cid.type == :colon2
-          [cid[2].to_s, expr(cid[1])]
-        elsif cid.type == :colon3
-          [cid[1].to_s, 'Opal.Object']
+        base, name = cid.children
+
+        if base.nil?
+          [name, '$nesting[0]']
         else
-          raise "Bad receiver in module"
+          [name, expr(base)]
         end
       end
     end

data/lib/opal/nodes/node_with_args.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'opal/nodes/scope'
 
 module Opal
@@ -29,9 +30,8 @@ module Opal
       end
 
       def split_args
-        args = self.args[1..-1]
+        args = self.args.children
         args.each_with_index do |arg, idx|
-          last_argument = (idx == args.length - 1)
           case arg.type
           when :arg, :mlhs, :kwarg, :kwoptarg, :kwrestarg
             if @post_args_started
@@ -59,29 +59,29 @@ module Opal
           end
         end
 
-        inline_args.each do |inline_arg|
-          inline_arg.meta[:inline] = true
+        inline_args.map! do |inline_arg|
+          inline_arg.updated(nil, nil, meta: { inline: true })
         end
 
         optimize_args!
       end
 
       def opt_args
-        @opt_args ||= args[1..-1].select { |arg| arg.first == :optarg }
+        @opt_args ||= args.children.select { |arg| arg.type == :optarg }
       end
 
       def rest_arg
-        @rest_arg ||= args[1..-1].find { |arg| arg.first == :restarg }
+        @rest_arg ||= args.children.find { |arg| arg.type == :restarg }
       end
 
       def keyword_args
-        @keyword_args ||= args[1..-1].select do |arg|
-          [:kwarg, :kwoptarg, :kwrestarg].include? arg.first
+        @keyword_args ||= args.children.select do |arg|
+          [:kwarg, :kwoptarg, :kwrestarg].include? arg.type
         end
       end
 
       def inline_args_sexp
-        s(:inline_args, *args[1..-1])
+        s(:inline_args, *args.children)
       end
 
       def post_args_sexp
@@ -106,7 +106,7 @@ module Opal
           add_temp "$iter = #{scope_name}.$$p"
           add_temp "#{yielder} = $iter || nil"
 
-          line "#{scope_name}.$$p = null;"
+          line "if ($iter) #{scope_name}.$$p = null;"
         end
       end
 
@@ -170,7 +170,7 @@ module Opal
       end
 
       def positive_arity
-        result = args.size - 1
+        result = args.children.size
 
         result -= keyword_args.size
         result += 1 if keyword_args.any?
@@ -198,7 +198,7 @@ module Opal
 
       def parameters_code
         stringified_parameters = args.children.map do |arg|
-          value = arg.type == :mlhs ? nil : arg[1]
+          value = arg.type == :mlhs ? nil : arg.children[0]
           build_parameter(SEXP_TO_PARAMETERS[arg.type], value)
         end
 
@@ -214,7 +214,7 @@ module Opal
       def arity_checks
         return @arity_checks if @arity_checks
 
-        arity = args.size - 1
+        arity = args.children.size
         arity -= (opt_args.size)
 
         arity -= 1 if rest_arg
@@ -223,14 +223,11 @@ module Opal
 
         arity = -arity - 1 if !opt_args.empty? or !keyword_args.empty? or rest_arg
 
-        # $arity will point to our received arguments count
-        aritycode = "var $arity = arguments.length;"
-
         @arity_checks = []
 
         if arity < 0 # splat or opt args
           min_arity = -(arity + 1)
-          max_arity = args.size - 1
+          max_arity = args.children.size
           @arity_checks << "$arity < #{min_arity}" if min_arity > 0
           @arity_checks << "$arity > #{max_arity}" if max_arity and not(rest_arg)
         else

data/lib/opal/nodes/rescue.rb

@@ -1,33 +1,8 @@
+# frozen_string_literal: true
 require 'opal/nodes/base'
 
 module Opal
   module Nodes
-    class RescueModNode < Base
-      handle :rescue_mod
-
-      children :lhs, :rhs
-
-      def body
-        stmt? ? lhs : compiler.returns(lhs)
-      end
-
-      def rescue_val
-        stmt? ? rhs : compiler.returns(rhs)
-      end
-
-      def compile
-        line "try {", expr(body), " } catch ($err) { "
-
-        indent do
-          line "if (Opal.rescue($err, [", expr(Sexp.new([:const, :StandardError])), "])) {"
-          line expr(rescue_val)
-          line "} else { throw $err; } }"
-        end
-
-        wrap '(function() {', '})()' unless stmt?
-      end
-    end
-
     class EnsureNode < Base
       handle :ensure
 
@@ -37,7 +12,7 @@ module Opal
         push "try {"
 
         in_ensure do
-          line compiler.process(body_sexp, @level)
+          line stmt(body_sexp)
         end
 
         line "} finally {"
@@ -59,7 +34,7 @@ module Opal
             indent do
               line "$rescue_else_result = (function() {"
               indent do
-                line compiler.process(compiler.returns(scope.rescue_else_sexp), @level)
+                line stmt(rescue_else_code)
               end
               line "})();"
             end
@@ -78,12 +53,9 @@ module Opal
 
       def body_sexp
         if wrap_in_closure?
-          sexp = compiler.returns(begn)
-          # 'rescue' is an edge case that should be compiled to
-          # try { return function(){ ..rescue through try/catch.. }() }
-          sexp.type == :rescue ? s(:js_return, sexp) : sexp
+          compiler.returns(begn)
         else
-          sexp = begn
+          begn
         end
       end
 
@@ -94,6 +66,12 @@ module Opal
       def wrap_in_closure?
         recv? or expr? or has_rescue_else?
       end
+
+      def rescue_else_code
+        rescue_else_code = scope.rescue_else_sexp
+        rescue_else_code = compiler.returns(rescue_else_code) unless stmt?
+        rescue_else_code
+      end
     end
 
     class RescueNode < Base
@@ -102,7 +80,7 @@ module Opal
       children :body
 
       def compile
-        scope.rescue_else_sexp = children[1..-1].detect { |sexp| sexp.type != :resbody }
+        scope.rescue_else_sexp = children[1..-1].detect { |sexp| sexp && sexp.type != :resbody }
         has_rescue_handlers = false
 
         if handle_rescue_else_manually?
@@ -111,7 +89,7 @@ module Opal
 
         push "try {"
         indent do
-          line process(body_code, @level)
+          line stmt(body_code)
         end
         line "} catch ($err) {"
 
@@ -122,7 +100,7 @@ module Opal
 
           children[1..-1].each_with_index do |child, idx|
             # counting only rescue, ignoring rescue-else statement
-            if child.type == :resbody
+            if child && child.type == :resbody
               has_rescue_handlers = true
 
               push " else " unless idx == 0
@@ -142,11 +120,7 @@ module Opal
           indent do
             line "if ($no_errors) { "
             indent do
-              line "return (function() {"
-              indent do
-                line compiler.process(compiler.returns(scope.rescue_else_sexp), @level)
-              end
-              line "})();"
+              line stmt(rescue_else_code)
             end
             line "}"
           end
@@ -161,10 +135,16 @@ module Opal
 
       def body_code
         body_code = (body.type == :resbody ? s(:nil) : body)
-        body_code = compiler.returns body_code unless stmt?
+        body_code = compiler.returns(body_code) unless stmt?
         body_code
       end
 
+      def rescue_else_code
+        rescue_else_code = scope.rescue_else_sexp
+        rescue_else_code = compiler.returns(rescue_else_code) unless stmt?
+        rescue_else_code
+      end
+
       # Returns true when there's no 'ensure' statement
       #  wrapping current rescue.
       #
@@ -176,48 +156,27 @@ module Opal
     class ResBodyNode < Base
       handle :resbody
 
-      children :args, :body
+      children :klasses_sexp, :lvar, :body
 
       def compile
-        push "if (Opal.rescue($err, ["
-        if rescue_exprs.empty?
-          # if no expressions are given, then catch StandardError only
-          push expr(Sexp.new([:const, :StandardError]))
-        else
-          rescue_exprs.each_with_index do |rexpr, idx|
-            push ', ' unless idx == 0
-            push expr(rexpr)
-          end
-        end
-        push "])) {"
+        push "if (Opal.rescue($err, ", expr(klasses), ")) {"
         indent do
-          if variable = rescue_variable
-            variable[2] = s(:js_tmp, '$err')
-            push expr(variable), ';'
+          if lvar
+            push expr(lvar), '$err;'
           end
 
           # Need to ensure we clear the current exception out after the rescue block ends
           line "try {"
           indent do
-            line process(rescue_body, @level)
+            line stmt(rescue_body)
           end
           line '} finally { Opal.pop_exception() }'
         end
         line "}"
       end
 
-      def rescue_variable?(variable)
-        Sexp === variable and [:lasgn, :iasgn].include?(variable.type)
-      end
-
-      def rescue_variable
-        rescue_variable?(args.last) ? args.last.dup : nil
-      end
-
-      def rescue_exprs
-        exprs = args.dup
-        exprs.pop if rescue_variable?(exprs.last)
-        exprs.children
+      def klasses
+        klasses_sexp || s(:array, s(:const, nil, :StandardError))
       end
 
       def rescue_body
@@ -226,5 +185,13 @@ module Opal
         body_code
       end
     end
+
+    class RetryNode < Base
+      handle :retry
+
+      def compile
+        push stmt(s(:send, nil, :retry))
+      end
+    end
   end
 end