opal 0.11.4 → 1.0.0.beta1

data/lib/opal/nodes/defined.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'opal/nodes/base'
 
 module Opal
@@ -24,35 +25,35 @@ module Opal
           end
         when :send
           compile_defined_send(value)
-          wrap "(", " ? 'method' : nil)"
+          wrap '(', " ? 'method' : nil)"
         when :ivar
           compile_defined_ivar(value)
-          wrap "(", " ? 'instance-variable' : nil)"
+          wrap '(', " ? 'instance-variable' : nil)"
         when :zsuper, :super
-          compile_defined_super(value)
+          compile_defined_super
         when :yield
-          compile_defined_yield(value)
-          wrap "(", " ? 'yield' : nil)"
+          compile_defined_yield
+          wrap '(', " ? 'yield' : nil)"
         when :xstr
           compile_defined_xstr(value)
         when :const
           compile_defined_const(value)
-          wrap "(", " ? 'constant' : nil)"
+          wrap '(', " ? 'constant' : nil)"
         when :cvar
           compile_defined_cvar(value)
-          wrap "(", " ? 'class variable' : nil)"
+          wrap '(', " ? 'class variable' : nil)"
         when :gvar
           compile_defined_gvar(value)
-          wrap "(", " ? 'global-variable' : nil)"
+          wrap '(', " ? 'global-variable' : nil)"
         when :back_ref
-          compile_defined_back_ref(value)
-          wrap "(", " ? 'global-variable' : nil)"
+          compile_defined_back_ref
+          wrap '(', " ? 'global-variable' : nil)"
         when :nth_ref
-          compile_defined_nth_ref(value)
-          wrap "(", " ? 'global-variable' : nil)"
+          compile_defined_nth_ref
+          wrap '(', " ? 'global-variable' : nil)"
         when :array
           compile_defined_array(value)
-          wrap "(", " ? 'expression' : nil)"
+          wrap '(', " ? 'expression' : nil)"
         else
           push "'expression'"
         end
@@ -65,7 +66,7 @@ module Opal
           __send__("compile_defined_#{type}", node)
         else
           node_tmp = scope.new_temp
-          push "(#{node_tmp} = ", expr(node), ")"
+          push "(#{node_tmp} = ", expr(node), ')'
           node_tmp
         end
       end
@@ -75,13 +76,13 @@ module Opal
 
         push "(#{returning_tmp} = (function() { try {"
         push "  return #{code};"
-        push "} catch ($err) {"
-        push "  if (Opal.rescue($err, [Opal.Exception])) {"
-        push "    try {"
-        push "      return false;"
-        push "    } finally { Opal.pop_exception() }"
-        push "  } else { throw $err; }"
-        push "}})())"
+        push '} catch ($err) {'
+        push '  if (Opal.rescue($err, [Opal.Exception])) {'
+        push '    try {'
+        push '      return false;'
+        push '    } finally { Opal.pop_exception() }'
+        push '  } else { throw $err; }'
+        push '}})())'
 
         returning_tmp
       end
@@ -96,17 +97,17 @@ module Opal
 
         if recv
           recv_code = compile_defined(recv)
-          push " && "
+          push ' && '
 
           if recv.type == :send
             recv_code = compile_send_recv_doesnt_raise(recv_code)
-            push " && "
+            push ' && '
           end
 
           recv_tmp = scope.new_temp
           push "(#{recv_tmp} = ", recv_code, ", #{recv_tmp}) && "
         else
-          recv_tmp = "self"
+          recv_tmp = 'self'
         end
 
         recv_value_tmp = scope.new_temp
@@ -122,7 +123,7 @@ module Opal
           when :block_pass
             # ignoring
           else
-            push " && "
+            push ' && '
             compile_defined(arg)
           end
         end
@@ -143,13 +144,13 @@ module Opal
         tmp
       end
 
-      def compile_defined_super(node)
+      def compile_defined_super
         push expr s(:defined_super)
       end
 
-      def compile_defined_yield(node)
+      def compile_defined_yield
         scope.uses_block!
-        block_name = scope.block_name || (parent = scope.find_parent_def && parent.block_name)
+        block_name = scope.block_name || scope.find_parent_def.block_name
         push "(#{block_name} != null && #{block_name} !== nil)"
         block_name
       end
@@ -164,17 +165,16 @@ module Opal
         const_tmp = scope.new_temp
 
         if const_scope.nil?
-          push "(#{const_tmp} = Opal.const_get_relative($nesting, '#{const_name}', 'skip_raise'))"
+          push "(#{const_tmp} = $$($nesting, '#{const_name}', 'skip_raise'))"
         elsif const_scope == s(:cbase)
-          push "(#{const_tmp} = Opal.const_get_qualified('::', '#{const_name}', 'skip_raise'))"
+          push "(#{const_tmp} = $$$('::', '#{const_name}', 'skip_raise'))"
         else
           const_scope_tmp = compile_defined(const_scope)
-          push " && (#{const_tmp} = Opal.const_get_qualified(#{const_scope_tmp}, '#{const_name}', 'skip_raise'))"
+          push " && (#{const_tmp} = $$$(#{const_scope_tmp}, '#{const_name}', 'skip_raise'))"
         end
         const_tmp
       end
 
-
       def compile_defined_cvar(node)
         cvar_name, _ = *node
         cvar_tmp = scope.new_temp
@@ -189,7 +189,7 @@ module Opal
         gvar_temp = scope.new_temp
 
         if %w[~ !].include? name
-          push "(#{gvar_temp} = ", expr(node), " || true)"
+          push "(#{gvar_temp} = ", expr(node), ' || true)'
         else
           push "(#{gvar_temp} = $gvars[#{name.inspect}], #{gvar_temp} != null)"
         end
@@ -197,14 +197,14 @@ module Opal
         gvar_temp
       end
 
-      def compile_defined_back_ref(node)
+      def compile_defined_back_ref
         helper :gvars
         back_ref_temp = scope.new_temp
         push "(#{back_ref_temp} = $gvars['~'], #{back_ref_temp} != null && #{back_ref_temp} !== nil)"
         back_ref_temp
       end
 
-      def compile_defined_nth_ref(node)
+      def compile_defined_nth_ref
         helper :gvars
 
         nth_ref_tmp = scope.new_temp
@@ -214,7 +214,7 @@ module Opal
 
       def compile_defined_array(node)
         node.children.each_with_index do |child, idx|
-          push " && " unless idx == 0
+          push ' && ' unless idx == 0
           compile_defined(child)
         end
       end

data/lib/opal/nodes/definitions.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'opal/nodes/base'
 
 module Opal
@@ -10,7 +11,7 @@ module Opal
 
       def compile
         children.each do |child|
-          line "Opal.udef(self, '$' + ", expr(child), ");"
+          line "Opal.udef(self, '$' + ", expr(child), ');'
         end
       end
     end
@@ -21,7 +22,7 @@ module Opal
       children :new_name, :old_name
 
       def compile
-        push "Opal.alias(self, ", expr(new_name), ", ", expr(old_name), ")"
+        push 'Opal.alias(self, ', expr(new_name), ', ', expr(old_name), ')'
       end
     end
 
@@ -29,7 +30,7 @@ module Opal
       handle :begin
 
       def compile
-        return push "nil" if children.empty?
+        return push 'nil' if children.empty?
 
         if stmt?
           compile_children(children, @level)
@@ -57,11 +58,11 @@ module Opal
 
       def compile_children(children, level)
         children.each do |child|
-          line process(child, level), ";"
+          line process(child, level), ';'
         end
       end
 
-      COMPLEX_CHILDREN = [:while, :while_post, :until, :until_post, :js_return]
+      COMPLEX_CHILDREN = %i[while while_post until until_post js_return].freeze
 
       def simple_children?
         children.none? do |child|
@@ -70,9 +71,11 @@ module Opal
       end
 
       def compile_inline_children(children, level)
-        children.map do |child|
+        processed_children = children.map do |child|
           process(child, level)
-        end.reject(&:empty?).each_with_index do |child, idx|
+        end
+
+        processed_children.reject(&:empty?).each_with_index do |child, idx|
           push ', ' unless idx == 0
           push child
         end

data/lib/opal/nodes/defs.rb

@@ -1,28 +1,20 @@
 # frozen_string_literal: true
+
 require 'opal/nodes/def'
 
 module Opal
   module Nodes
     class DefsNode < DefNode
       handle :defs
-      children :recvr, :mid, :args, :stmts
-
-      def extract_block_arg
-        *regular_args, last_arg = args.children
-        if last_arg && last_arg.type == :blockarg
-          @block_arg = last_arg.children[0]
-          @sexp = @sexp.updated(nil, [
-            recvr,
-            mid,
-            s(:args, *regular_args),
-            stmts
-          ])
-        end
-      end
+      children :recvr, :mid, :inline_args, :stmts
 
       def wrap_with_definition
-        unshift "Opal.defs(", expr(recvr), ", '$#{mid}', "
-        push ")"
+        unshift 'Opal.defs(', expr(recvr), ", '$#{mid}', "
+        push ')'
+
+        if expr?
+          wrap '(', ", nil) && '#{mid}'"
+        end
       end
     end
   end

data/lib/opal/nodes/hash.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'opal/nodes/base'
 
 module Opal
@@ -26,7 +27,7 @@ module Opal
       end
 
       def simple_keys?
-        keys.all? { |key| [:sym, :str].include?(key.type) }
+        keys.all? { |key| %i[sym str].include?(key.type) }
       end
 
       def compile
@@ -69,7 +70,7 @@ module Opal
           if idx == 0
             push fragment
           else
-            push ".$merge(", fragment, ")"
+            push '.$merge(', fragment, ')'
           end
         end
       end
@@ -106,7 +107,7 @@ module Opal
           push hash_obj[key]
         end
 
-        wrap "$hash2([#{hash_keys.join ', '}], {", "})"
+        wrap "$hash2([#{hash_keys.join ', '}], {", '})'
       end
     end
 
@@ -115,7 +116,7 @@ module Opal
       children :value
 
       def compile
-        push "Opal.to_hash(", expr(value), ")"
+        push 'Opal.to_hash(', expr(value), ')'
       end
     end
   end

data/lib/opal/nodes/helpers.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'opal/regexp_anchors'
 
 module Opal
@@ -18,7 +19,7 @@ module Opal
       # have a '.' prefix (for dot-calling), otherwise it will be
       # wrapped in brackets to use reference notation calling.
       def mid_to_jsid(mid)
-        if /\=|\+|\-|\*|\/|\!|\?|<|\>|\&|\||\^|\%|\~|\[/ =~ mid.to_s
+        if %r{\=|\+|\-|\*|\/|\!|\?|<|\>|\&|\||\^|\%|\~|\[} =~ mid.to_s
           "['$#{mid}']"
         else
           '.$' + mid
@@ -48,7 +49,7 @@ module Opal
         end
 
         helper :truthy
-        [fragment("$truthy("),expr(sexp),fragment(")")]
+        [fragment('$truthy('), expr(sexp), fragment(')')]
       end
 
       def js_falsy(sexp)
@@ -61,7 +62,7 @@ module Opal
         end
 
         helper :falsy
-        [fragment("$falsy("),expr(sexp),fragment(")")]
+        [fragment('$falsy('), expr(sexp), fragment(')')]
       end
 
       def js_truthy_optimize(sexp)
@@ -73,12 +74,12 @@ module Opal
           # Monkey patch method calls might return 'self'/aka a bridged instance and need
           # the nil check - see discussion at https://github.com/opal/opal/pull/1097
           allow_optimization_on_type = Compiler::COMPARE.include?(mid.to_s) &&
-            receiver_handler_class &&
-            receiver_handler_class.truthy_optimize?
+                                       receiver_handler_class &&
+                                       receiver_handler_class.truthy_optimize?
 
           if allow_optimization_on_type ||
-            mid == :block_given? ||
-            mid == :"=="
+             mid == :block_given? ||
+             mid == :"=="
             expr(sexp)
           end
         end
@@ -102,7 +103,6 @@ module Opal
         yield receiver_temp
         wrap '(', ')'
       end
-
     end
   end
 end

data/lib/opal/nodes/if.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'opal/nodes/base'
 
 module Opal
@@ -9,29 +10,30 @@ module Opal
       children :test, :true_body, :false_body
 
       def compile
-        truthy, falsy = self.truthy, self.falsy
+        truthy = self.truthy
+        falsy = self.falsy
 
-        push "if (", js_truthy(test), ") {"
+        push 'if (', js_truthy(test), ') {'
 
         # skip if-body if no truthy sexp
         indent { line stmt(truthy) } if truthy
 
         if falsy
           if falsy.type == :if
-            line "} else ", stmt(falsy)
+            line '} else ', stmt(falsy)
           else
+            line '} else {'
             indent do
-              line "} else {"
               line stmt(falsy)
             end
 
-            line "}"
+            line '}'
           end
         else
-          push "}"
+          push '}'
         end
 
-        wrap "(function() {", "; return nil; })()" if needs_wrapper?
+        wrap '(function() {', '; return nil; })()' if needs_wrapper?
       end
 
       def truthy
@@ -43,7 +45,7 @@ module Opal
       end
 
       def needs_wrapper?
-        expr? or recv?
+        expr? || recv?
       end
     end
 

data/lib/opal/nodes/iter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'opal/nodes/node_with_args'
 require 'opal/rewriters/break_finder'
 
@@ -7,34 +8,20 @@ module Opal
     class IterNode < NodeWithArgs
       handle :iter
 
-      children :args, :body
-
-      attr_accessor :block_arg, :shadow_args
+      children :inline_args, :body
 
       def compile
         inline_params = nil
-        extract_block_arg
-        extract_shadow_args
-        extract_underscore_args
-        split_args
 
         to_vars = identity = body_code = nil
 
         in_scope do
-          inline_params = process(inline_args_sexp)
-
           identity = scope.identify!
           add_temp "self = #{identity}.$$s || this"
 
-          compile_block_arg
-          compile_shadow_args
-          compile_inline_args
-          compile_post_args
-          compile_norm_args
+          inline_params = process(inline_args)
 
-          if compiler.arity_check?
-            compile_arity_check
-          end
+          compile_arity_check
 
           body_code = stmt(returned_body)
           to_vars = scope.to_vars
@@ -44,7 +31,7 @@ module Opal
 
         unshift to_vars
 
-        unshift "(#{identity} = function(", inline_params, "){"
+        unshift "(#{identity} = function(", inline_params, '){'
         push "}, #{identity}.$$s = self,"
         push " #{identity}.$$brk = $brk," if contains_break?
         push " #{identity}.$$arity = #{arity},"
@@ -72,17 +59,6 @@ module Opal
         push " #{identity})"
       end
 
-      def norm_args
-        @norm_args ||= args.children.select { |arg| arg.type == :arg }
-      end
-
-      def compile_norm_args
-        norm_args.each do |arg|
-          arg_name, _ = *arg
-          push "if (#{arg_name} == null) #{arg_name} = nil;"
-        end
-      end
-
       def compile_block_arg
         if block_arg
           scope.block_name = block_arg
@@ -94,44 +70,6 @@ module Opal
         end
       end
 
-      def extract_block_arg
-        *regular_args, last_arg = args.children
-        if last_arg && last_arg.type == :blockarg
-          @block_arg = last_arg.children[0]
-          @sexp = @sexp.updated(nil, [
-            s(:args, *regular_args),
-            body
-          ])
-        end
-      end
-
-      def compile_shadow_args
-        shadow_args.each do |shadow_arg|
-          arg_name = shadow_arg.children[0]
-          scope.locals << arg_name
-          scope.add_arg(arg_name)
-        end
-      end
-
-      def extract_shadow_args
-        @shadow_args = []
-        valid_args = []
-        return unless args
-
-        args.children.each_with_index do |arg, idx|
-          if arg.type == :shadowarg
-            @shadow_args << arg
-          else
-            valid_args << arg
-          end
-        end
-
-        @sexp = @sexp.updated(nil, [
-          args.updated(nil, valid_args),
-          body
-        ])
-      end
-
       def extract_underscore_args
         valid_args = []
         caught_blank_argument = false
@@ -148,56 +86,31 @@ module Opal
           end
         end
 
-        @sexp = @sexp.updated(nil, [
-          args.updated(nil, valid_args),
-          body
-        ])
+        @sexp = @sexp.updated(
+          nil, [
+            args.updated(nil, valid_args),
+            body
+          ]
+        )
       end
 
       def returned_body
         compiler.returns(body || s(:nil))
       end
 
-      def mlhs_args
-        scope.mlhs_mapping.keys
-      end
-
       def has_top_level_mlhs_arg?
-        args.children.any? { |arg| arg.type == :mlhs }
+        original_args.children.any? { |arg| arg.type == :mlhs }
       end
 
       def has_trailing_comma_in_args?
-        if args.loc && args.loc.expression
-          args_source = args.loc.expression.source
+        if original_args.loc && original_args.loc.expression
+          args_source = original_args.loc.expression.source
           args_source.match(/,\s*\|/)
         end
       end
 
-      # Returns code used in debug mode to check arity of method call
-      def compile_arity_check
-        if arity_checks.size > 0
-          parent_scope = scope
-          while !(parent_scope.top? || parent_scope.def? || parent_scope.class_scope?)
-            parent_scope = parent_scope.parent
-          end
-
-          context = if parent_scope.top?
-            "'<main>'"
-          elsif parent_scope.def?
-            "'#{parent_scope.mid}'"
-          elsif parent_scope.class?
-            "'<class:#{parent_scope.name}>'"
-          elsif parent_scope.module?
-            "'<module:#{parent_scope.name}>'"
-          end
-
-          identity = scope.identity
-
-          line "if (#{identity}.$$is_lambda || #{identity}.$$define_meth) {"
-          line "  var $arity = arguments.length;"
-          line "  if (#{arity_checks.join(' || ')}) { Opal.block_ac($arity, #{arity}, #{context}); }"
-          line "}"
-        end
+      def arity_check_node
+        s(:iter_arity_check, original_args)
       end
 
       def contains_break?