opal 0.10.0 → 0.11.0

data/lib/opal/nodes/super.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'opal/nodes/base'
 
 module Opal
@@ -6,103 +7,92 @@ module Opal
     # body. This is then used by actual super calls, or a defined?(super) style
     # call.
     class BaseSuperNode < CallNode
-      children :arglist, :raw_iter
+      def initialize(*)
+        super
+        args = *@sexp
+        *rest, last_child = *args
 
-      def compile
-        if scope.def?
-          scope.uses_block!
+        if last_child && [:iter, :block_pass].include?(last_child.type)
+          @iter = last_child
+          args = rest
+        else
+          @iter = s(:js_tmp, 'null')
         end
 
-        default_compile
+        @arglist = s(:arglist, *args)
+        @recvr = s(:self)
       end
 
-      private
+      def compile_using_send
+        helper :send
 
-      # always on self
-      def recvr
-        s(:self)
-      end
-
-      def iter
-        # Need to support passing block up even if it's not referenced in this method at all
-        @iter ||= begin
-          if raw_iter
-            raw_iter
-          elsif arglist # TODO: Better understand this elsif vs. the else code path
-            s(:js_tmp, 'null')
-          else
-            scope.uses_block!
-            s(:js_tmp, '$iter')
-          end
-        end
+        push '$send('
+        compile_receiver
+        compile_method
+        compile_arguments
+        compile_block_pass
+        push ')'
       end
 
-      def method_jsid
-        raise 'Not implemented, see #add_method'
+      private
+
+      # Using super in a block inside a method is allowed, e.g.
+      # def a
+      #  { super }
+      # end
+      #
+      # This method finds returns a closest s(:def) (or s(:defs))
+      def def_scope
+        @def_scope ||= scope.def? ? scope : scope.find_parent_def
       end
 
-      # Need a way to pass self into the method invocation
-      def redefine_this?(temporary_receiver)
-        true
+      def raise_exception?
+        @sexp.type == :defined_super
       end
 
-      def arguments_array?
-        # zuper is an implicit super argument array
-        super || @implicit_args
+      def defined_check_param
+        raise_exception? ? 'true' : 'false'
       end
 
-      def containing_def_scope
-        return scope if scope.def?
+      def implicit_args?
+        @sexp.type == :zsuper
+      end
 
-        # using super in a block inside a method is allowed, e.g.
-        # def a
-        #  { super }
-        # end
-        scope.find_parent_def
+      def implicit_arguments_param
+        implicit_args? ? 'true' : 'false'
       end
 
-      def defined_check_param
-        'false'
+      def method_id
+        def_scope.mid.to_s
       end
 
-      def implicit_arguments_param
-        @implicit_args ? 'true' : 'false'
+      def def_scope_identity
+        def_scope.identify!(def_scope.mid)
       end
 
       def super_method_invocation
-        def_scope = containing_def_scope
-        method_jsid = def_scope.mid.to_s
-        current_func = def_scope.identify!
-
         if def_scope.defs
           class_name = def_scope.parent.name ? "$#{def_scope.parent.name}" : 'self.$$class.$$proto'
-          "Opal.find_super_dispatcher(self, '#{method_jsid}', #{current_func}, #{defined_check_param}, #{class_name})"
+          "Opal.find_super_dispatcher(self, '#{method_id}', #{def_scope_identity}, #{defined_check_param}, #{class_name})"
         else
-          "Opal.find_super_dispatcher(self, '#{method_jsid}', #{current_func}, #{defined_check_param})"
+          "Opal.find_super_dispatcher(self, '#{method_id}', #{def_scope_identity}, #{defined_check_param})"
         end
       end
 
       def super_block_invocation
         chain, cur_defn, mid = scope.get_super_chain
         trys = chain.map { |c| "#{c}.$$def" }.join(' || ')
-        implicit = @implicit_args.to_s
-
         "Opal.find_iter_super_dispatcher(self, #{mid}, (#{trys} || #{cur_defn}), #{defined_check_param}, #{implicit_arguments_param})"
       end
 
-      def add_method(temporary_receiver)
-        super_call = if scope.def?
-          super_method_invocation
+      def compile_method
+        push ", "
+        if scope.def?
+          push super_method_invocation
         elsif scope.iter?
-          super_block_invocation
+          push super_block_invocation
         else
-          raise 'unexpected compilation error'
-        end
-
-        if temporary_receiver
-          push "(#{temporary_receiver} = ", receiver_fragment, ", ", super_call, ")"
-        else
-          push super_call
+          raise 'super must be called from method body or block'
         end
       end
     end
@@ -110,12 +100,10 @@ module Opal
     class DefinedSuperNode < BaseSuperNode
       handle :defined_super
 
-      def defined_check_param
-        'true'
-      end
-
       def compile
-        add_method(nil)
+        compile_receiver
+        compile_method
+
         # will never come back null with method missing on
         if compiler.method_missing?
           wrap '(!(', '.$$stub) ? "super" : nil)'
@@ -126,38 +114,74 @@ module Opal
       end
     end
 
+    # super with implicit args
     class SuperNode < BaseSuperNode
       handle :super
 
+      def initialize(*)
+        super
+
+        if scope.def?
+          scope.uses_block!
+        end
+      end
+
+      def compile
+        compile_using_send
+      end
+    end
+
+    # super with explicit args
+    class ZsuperNode < SuperNode
+      handle :zsuper
+
+      def initialize(*)
+        super
+
+        # preserve a block if we have one already but otherwise, assume a block is coming from higher
+        # up the chain
+        unless iter.type == :iter
+          # Need to support passing block up even if it's not referenced in this method at all
+          scope.uses_block!
+          @iter = s(:js_tmp, '$iter')
+        end
+      end
+
       def compile
-        if arglist == nil
-          @implicit_args = true
-          if containing_def_scope
-            containing_def_scope.uses_zuper = true
-            @arguments_without_block = [s(:js_tmp, '$zuper')]
-            # If the method we're in has a block and we're using a default super call with no args, we need to grab the block
-            # If an iter (block via braces) is provided, that takes precedence
-            if (block_arg = formal_block_parameter) && !iter
-              expr = s(:block_pass, s(:lvar, block_arg[1]))
-              @arguments_without_block << expr
-            end
-          else
-            @arguments_without_block = []
+        if def_scope
+          def_scope.uses_zuper = true
+          implicit_args = [s(:js_tmp, '$zuper')]
+          # If the method we're in has a block and we're using a default super call with no args, we need to grab the block
+          # If an iter (block via braces) is provided, that takes precedence
+          if (block_arg = formal_block_parameter) && !iter
+            block_pass = s(:block_pass, s(:lvar, block_arg[1]))
+            implicit_args << block_pass
           end
+
+          @arglist = s(:arglist, *implicit_args)
         end
-        super
+
+        compile_using_send
       end
 
-      private
+      def compile_arguments
+        push ", "
+
+        if arglist.children.empty?
+          push '[]'
+        else
+          push expr(arglist)
+        end
+      end
 
       def formal_block_parameter
-        case containing_def_scope
-          when Opal::Nodes::IterNode
-            containing_def_scope.extract_block_arg
-          when Opal::Nodes::DefNode
-            containing_def_scope.block_arg
-          else
-            raise "Don't know what to do with scope #{containing_def_scope}"
+        case def_scope
+        when Opal::Nodes::IterNode
+          def_scope.extract_block_arg
+        when Opal::Nodes::DefNode
+          def_scope.block_arg
+        else
+          raise "Don't know what to do with super in the scope #{def_scope}"
         end
       end
     end

data/lib/opal/nodes/top.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'pathname'
 require 'opal/version'
 require 'opal/nodes/scope'
@@ -18,8 +19,12 @@ module Opal
           body_code = stmt(stmts)
           body_code = [body_code] unless body_code.is_a?(Array)
 
-          add_temp 'self = Opal.top' unless compiler.eval?
-          add_temp compiler.eval? ? '$scope = (self.$$scope || self.$$class.$$scope)' : '$scope = Opal'
+          if compiler.eval?
+            add_temp '$nesting = self.$$is_a_module ? [self] : [self.$$class]'
+          else
+            add_temp 'self = Opal.top'
+            add_temp '$nesting = []'
+          end
           add_temp 'nil = Opal.nil'
 
           add_used_helpers

data/lib/opal/nodes/variables.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'opal/nodes/base'
 
 module Opal
@@ -12,7 +13,7 @@ module Opal
       end
 
       def compile
-        return push(variable(var_name.to_s)) unless using_irb?
+        return push(var_name.to_s) unless using_irb?
 
         with_temp do |tmp|
           push property(var_name.to_s)
@@ -22,7 +23,7 @@ module Opal
     end
 
     class LocalAssignNode < Base
-      handle :lasgn
+      handle :lvasgn
 
       children :var_name, :value
 
@@ -34,14 +35,25 @@ module Opal
         if using_irb?
           push "Opal.irb_vars#{property var_name.to_s} = "
         else
-          add_local variable(var_name.to_s)
+          add_local var_name.to_s
 
-          push "#{variable(var_name.to_s)} = "
+          push "#{var_name} = "
         end
 
         push expr(value)
 
-        wrap '(', ')' if recv?
+        wrap '(', ')' if (recv? || expr?) && value
+      end
+    end
+
+    class LocalDeclareNode < Base
+      handle :lvdeclare
+
+      children :var_name
+
+      def compile
+        add_local(var_name.to_s)
+        nil
       end
     end
 
@@ -55,14 +67,14 @@ module Opal
       end
 
       def compile
-        name = property ivar(var_name)
+        name = property(var_name)
         add_ivar name
         push "self#{name}"
       end
     end
 
     class InstanceAssignNode < Base
-      handle :iasgn
+      handle :ivasgn
 
       children :name, :value
 
@@ -71,9 +83,11 @@ module Opal
       end
 
       def compile
-        name = property ivar(var_name)
+        name = property(var_name)
         push "self#{name} = "
         push expr(value)
+
+        wrap '(', ')'  if (recv? || expr?) && value
       end
     end
 
@@ -89,19 +103,38 @@ module Opal
       def compile
         helper :gvars
 
-        if var_name == '&'
-          return handle_global_match
-        elsif var_name == "'"
-          return handle_post_match
-        elsif var_name == '`'
-          return handle_pre_match
-        end
-
         name = property var_name
         add_gvar name
         push "$gvars#{name}"
       end
 
+    end
+
+    # back_ref can be:
+    # $`
+    # $'
+    # $&
+    # $+ (currently unsupported)
+    class BackRefNode < GlobalVariableNode
+      handle :back_ref
+
+      def compile
+        helper :gvars
+
+        case var_name
+        when '&'
+          handle_global_match
+        when "'"
+          handle_post_match
+        when '`'
+          handle_pre_match
+        when '+'
+          super
+        else
+          raise NotImplementedError
+        end
+      end
+
       def handle_global_match
         with_temp do |tmp|
           push "((#{tmp} = $gvars['~']) === nil ? nil : #{tmp}['$[]'](0))"
@@ -122,7 +155,7 @@ module Opal
     end
 
     class GlobalAssignNode < Base
-      handle :gasgn
+      handle :gvasgn
 
       children :name, :value
 
@@ -135,10 +168,13 @@ module Opal
         name = property var_name
         push "$gvars#{name} = "
         push expr(value)
+
+        wrap '(', ')'  if (recv? || expr?) && value
       end
     end
 
-    class BackrefNode < Base
+    # $1 => s(:nth_ref, 1)
+    class NthrefNode < Base
       handle :nth_ref
 
       children :index
@@ -159,32 +195,18 @@ module Opal
 
       def compile
         with_temp do |tmp|
-          push "((#{tmp} = Opal.cvars['#{name}']) == null ? nil : #{tmp})"
+          push "((#{tmp} = #{class_variable_owner}.$$cvars['#{name}']) == null ? nil : #{tmp})"
         end
       end
     end
 
     class ClassVarAssignNode < Base
-      handle :casgn
+      handle :cvasgn
 
       children :name, :value
 
       def compile
-        push "(Opal.cvars['#{name}'] = "
-        push expr(value)
-        push ")"
-      end
-    end
-
-    class ClassVarDeclNode < Base
-      handle :cvdecl
-
-      children :name, :value
-
-      def compile
-        push "(Opal.cvars['#{name}'] = "
-        push expr(value)
-        push ")"
+        push "(Opal.class_variable_set(#{class_variable_owner}, '#{name}', ", expr(value), "))"
       end
     end
   end

data/lib/opal/nodes/while.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'opal/nodes/base'
 
 module Opal
@@ -26,8 +27,9 @@ module Opal
             end
 
             push "#{redo_var} = false;" if uses_redo?
-            line body_code, "}"
+            line body_code
           end
+          line "}"
         end
 
         wrap '(function() {', '; return nil; })()' if wrap_in_closure?
@@ -50,6 +52,10 @@ module Opal
       end
     end
 
+    class WhilePostNode < WhileNode
+      handle :while_post
+    end
+
     class UntilNode < WhileNode
       handle :until
 
@@ -61,5 +67,9 @@ module Opal
         ")) {"
       end
     end
+
+    class UntilPostNode < UntilNode
+      handle :until_post
+    end
   end
 end

data/lib/opal/nodes/yield.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'opal/nodes/base'
 
 module Opal
@@ -52,23 +53,6 @@ module Opal
       end
     end
 
-    # special opal yield assign, for `a = yield(arg1, arg2)` to assign
-    # to a temp value to make yield expr into stmt.
-    #
-    # level will always be stmt as its the reason for this to exist
-    #
-    # s(:yasgn, :a, s(:yield, arg1, arg2))
-    class YasgnNode < BaseYieldNode
-      handle :yasgn
-
-      children :var_name, :yield_args
-
-      def compile
-        compile_call(s(*yield_args[1..-1]), :stmt)
-        wrap "(#{var_name} = ", ")"
-      end
-    end
-
     # Created by `#returns()` for when a yield statement should return
     # it's value (its last in a block etc).
     class ReturnableYieldNode < BaseYieldNode

data/lib/opal/nodes.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
 require 'opal/nodes/base'
 require 'opal/nodes/literal'
 require 'opal/nodes/variables'
 require 'opal/nodes/constants'
 require 'opal/nodes/call'
+require 'opal/nodes/csend'
 require 'opal/nodes/call_special'
 require 'opal/nodes/module'
 require 'opal/nodes/class'
@@ -19,6 +21,7 @@ require 'opal/nodes/args/post_kwargs'
 require 'opal/nodes/args/post_args'
 require 'opal/nodes/iter'
 require 'opal/nodes/def'
+require 'opal/nodes/defs'
 require 'opal/nodes/if'
 require 'opal/nodes/logic'
 require 'opal/nodes/definitions'
@@ -28,7 +31,6 @@ require 'opal/nodes/case'
 require 'opal/nodes/super'
 require 'opal/nodes/top'
 require 'opal/nodes/while'
-require 'opal/nodes/for'
 require 'opal/nodes/hash'
 require 'opal/nodes/array'
 require 'opal/nodes/defined'