opal 0.10.0 → 0.11.0

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
 
@@ -212,9 +212,9 @@ module Opal
       # Returns an array of JS conditions for raising and argument
       # error caused by arity check
       def arity_checks
-        return @arity_checks if @arity_checks
+        return @arity_checks if defined?(@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

data/lib/opal/nodes/runtime_helpers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'set'
 require 'opal/nodes/base'
 
@@ -8,8 +9,12 @@ module Opal
 
       children :recvr, :meth, :arglist
 
+      def self.s(type, *children)
+        ::Opal::AST::Node.new(type, children)
+      end
+
       def self.compatible?(recvr, meth, arglist)
-        recvr == [:const, :Opal] and HELPERS.include?(meth.to_sym)
+        recvr == s(:const, nil, :Opal) and HELPERS.include?(meth.to_sym)
       end
 
       def self.helper(name, &block)
@@ -26,7 +31,7 @@ module Opal
       end
 
       helper :truthy? do
-        unless sexp = arglist[1]
+        unless sexp = arglist.children[0]
           raise "truthy? requires an object"
         end
 
@@ -34,7 +39,7 @@ module Opal
       end
 
       helper :falsy? do
-        unless sexp = arglist[1]
+        unless sexp = arglist.children[0]
           raise "falsy? requires an object"
         end
 

data/lib/opal/nodes/scope.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'opal/nodes/base'
 
 module Opal
@@ -52,6 +53,7 @@ module Opal
         @methods = []
 
         @uses_block = false
+        @in_ensure = false
 
         # used by classes to store all ivars used in direct def methods
         @proto_ivars = []
@@ -96,7 +98,7 @@ module Opal
       end
 
       def def?
-        @type == :def
+        @type == :def || @type == :defs
       end
 
       # Is this a normal def method directly inside a class? This is
@@ -232,10 +234,12 @@ module Opal
         end
       end
 
-      def identify!
+      def identify!(name = nil)
         return @identity if @identity
 
-        @identity = @compiler.unique_temp
+        # Parent scope is the defining module/class
+        name ||= [(parent && (parent.name || parent.scope_name)), self.mid].compact.join('_')
+        @identity = @compiler.unique_temp(name)
         @parent.add_scope_temp @identity if @parent
 
         @identity
@@ -264,11 +268,10 @@ module Opal
             chain << scope.identify!
             scope = scope.parent if scope.parent
 
-          elsif scope.type == :def
+          elsif [:def, :defs].include?(scope.type)
             defn = scope.identify!
             mid  = "'#{scope.mid}'"
             break
-
           else
             break
           end
@@ -291,6 +294,8 @@ module Opal
         @in_ensure = true
         result = yield
         @in_ensure = false
+
+        result
       end
 
       def in_ensure?

data/lib/opal/nodes/singleton_class.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'opal/nodes/scope'
 
 module Opal
@@ -8,18 +9,18 @@ module Opal
       children :object, :body
 
       def compile
-        push "(function(self) {"
+        push "(function(self, $parent_nesting) {"
 
         in_scope do
-          add_temp '$scope = self.$$scope'
           add_temp 'def = self.$$proto'
+          add_temp '$nesting = [self].concat($parent_nesting)'
 
           body_stmt = stmt(compiler.returns(body))
           line scope.to_vars
           line body_stmt
         end
 
-        line "})(Opal.get_singleton_class(", recv(object), "))"
+        line "})(Opal.get_singleton_class(", recv(object), "), $nesting)"
       end
     end
   end