opal 0.11.4 → 1.0.0.beta1

data/lib/opal/nodes/call.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'set'
 require 'pathname'
 require 'opal/nodes/base'
@@ -16,7 +17,7 @@ module Opal
 
       # Operators that get optimized by compiler
       OPERATORS = { :+ => :plus, :- => :minus, :* => :times, :/ => :divide,
-                    :< => :lt, :<= => :le, :> => :gt, :>= => :ge }
+                    :< => :lt, :<= => :le, :> => :gt, :>= => :ge }.freeze
 
       def self.add_special(name, options = {}, &handler)
         SPECIALS[name] = options
@@ -29,7 +30,7 @@ module Opal
 
         *rest, last_arg = *args
 
-        if last_arg && [:iter, :block_pass].include?(last_arg.type)
+        if last_arg && %i[iter block_pass].include?(last_arg.type)
           @iter = last_arg
           args = rest
         else
@@ -118,7 +119,7 @@ module Opal
       end
 
       def compile_arguments
-        push ", "
+        push ', '
 
         if splat?
           push expr(arglist)
@@ -131,7 +132,7 @@ module Opal
 
       def compile_block_pass
         if iter
-          push ", ", expr(iter)
+          push ', ', expr(iter)
         end
       end
 
@@ -144,7 +145,7 @@ module Opal
       end
 
       def compile_simple_call_chain
-        push recv(receiver_sexp), method_jsid, "(", expr(arglist), ")"
+        push recv(receiver_sexp), method_jsid, '(', expr(arglist), ')'
       end
 
       def splat?
@@ -175,7 +176,7 @@ module Opal
       # a variable reference in irb mode in top scope might be a var ref,
       # or it might be a method call
       def using_irb?
-        @compiler.irb? and scope.top? and arglist == s(:arglist) and recvr.nil? and iter.nil?
+        @compiler.irb? && scope.top? && arglist == s(:arglist) && recvr.nil? && iter.nil?
       end
 
       def sexp_with_arglist
@@ -189,10 +190,10 @@ module Opal
         if SPECIALS.include? meth
           method = method("handle_#{meth}")
           method.arity == 1 ? method[compile_default] : method[]
-        elsif RuntimeHelpers.compatible?(recvr, meth, arglist)
+        elsif RuntimeHelpers.compatible?(recvr, meth)
           push(RuntimeHelpers.new(sexp_with_arglist, @level, @compiler).compile)
         else
-          compile_default.call
+          yield # i.e. compile_default.call
         end
       end
 
@@ -205,9 +206,9 @@ module Opal
 
             push fragment("$rb_#{name}(")
             push lhs
-            push fragment(", ")
+            push fragment(', ')
             push rhs
-            push fragment(")")
+            push fragment(')')
           else
             compile_default.call
           end
@@ -220,7 +221,7 @@ module Opal
         compile_default.call
       end
 
-      add_special :require_relative do |_compile_default|
+      add_special :require_relative do
         arg = arglist.children[0]
         file = compiler.file
         if arg.type == :str
@@ -255,11 +256,11 @@ module Opal
         compile_default.call
       end
 
-      add_special :block_given? do |compile_default|
+      add_special :block_given? do
         push compiler.handle_block_given_call @sexp
       end
 
-      add_special :__callee__ do |compile_default|
+      add_special :__callee__ do
         if scope.def?
           push fragment scope.mid.to_s.inspect
         else
@@ -267,7 +268,7 @@ module Opal
         end
       end
 
-      add_special :__method__ do |compile_default|
+      add_special :__method__ do
         if scope.def?
           push fragment scope.mid.to_s.inspect
         else
@@ -275,29 +276,29 @@ module Opal
         end
       end
 
-      add_special :debugger do |compile_default|
+      add_special :debugger do
         push fragment 'debugger'
       end
 
-      add_special :__OPAL_COMPILER_CONFIG__ do |compile_default|
+      add_special :__OPAL_COMPILER_CONFIG__ do
         push fragment "Opal.hash({ arity_check: #{compiler.arity_check?} })"
       end
 
       add_special :nesting do |compile_default|
-        push_nesting = push_nesting?(children)
+        push_nesting = push_nesting?
         push '(Opal.Module.$$nesting = $nesting, ' if push_nesting
         compile_default.call
         push ')' if push_nesting
       end
 
       add_special :constants do |compile_default|
-        push_nesting = push_nesting?(children)
+        push_nesting = push_nesting?
         push '(Opal.Module.$$nesting = $nesting, ' if push_nesting
         compile_default.call
         push ')' if push_nesting
       end
 
-      def push_nesting?(recv)
+      def push_nesting?
         recv = children.first
 
         children.size == 2 && (           # only receiver and method
@@ -328,7 +329,7 @@ module Opal
 
             parts = args.map { |s| handle_part s }
 
-            if ::Opal::AST::Node === recv && recv.type == :const && recv.children.last == :File
+            if recv.is_a?(::Opal::AST::Node) && recv.type == :const && recv.children.last == :File
               if meth == :expand_path
                 return expand_path(*parts)
               elsif meth == :join
@@ -339,7 +340,7 @@ module Opal
             end
           end
 
-          msg = "Cannot handle dynamic require"
+          msg = 'Cannot handle dynamic require'
           case @compiler.dynamic_require_severity
           when :error
             @compiler.error msg, @sexp.line
@@ -349,7 +350,7 @@ module Opal
         end
 
         def expand_path(path, base = '')
-          "#{base}/#{path}".split("/").inject([]) do |p, part|
+          "#{base}/#{path}".split('/').each_with_object([]) do |part, p|
             if part == ''
               # we had '//', so ignore
             elsif part == '..'
@@ -357,9 +358,7 @@ module Opal
             else
               p << part
             end
-
-            p
-          end.join "/"
+          end.join '/'
         end
       end
     end

data/lib/opal/nodes/call_special.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'opal/nodes/base'
 require 'opal/nodes/call'
 
@@ -50,12 +51,12 @@ module Opal
       end
 
       def compile_using_send
-        push recv(receiver_sexp), method_jsid, ".apply(null"
+        push recv(receiver_sexp), method_jsid, '.apply(null'
         compile_arguments
         if iter
-          push ".concat(", expr(iter), ")"
+          push '.concat(', expr(iter), ')'
         end
-        push ")"
+        push ')'
       end
     end
 

data/lib/opal/nodes/case.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'opal/nodes/base'
 
 module Opal
@@ -23,29 +24,28 @@ module Opal
           case_stmt[:cond] = true
           add_local '$case'
 
-          push "$case = ", expr(condition), ";"
+          push '$case = ', expr(condition), ';'
         end
 
         case_parts.each_with_index do |wen, idx|
-          if wen
-            line
-            case wen.type
-            when :when
-              wen = compiler.returns(wen) if needs_closure?
-              push "else " unless idx == 0
-              push stmt(wen)
-            else # s(:else)
-              handled_else = true
-              wen = compiler.returns(wen) if needs_closure?
-              push "else {", stmt(wen), "}"
-            end
+          next unless wen
+          line
+          case wen.type
+          when :when
+            wen = compiler.returns(wen) if needs_closure?
+            push 'else ' unless idx == 0
+            push stmt(wen)
+          else # s(:else)
+            handled_else = true
+            wen = compiler.returns(wen) if needs_closure?
+            push 'else {', stmt(wen), '}'
           end
         end
 
         # if we are having a closure, we must return a usable value
-        if needs_closure? and !handled_else
+        if needs_closure? && !handled_else
           line
-          push "else { return nil }"
+          push 'else { return nil }'
         end
       end
 
@@ -68,30 +68,28 @@ module Opal
       children :whens, :body
 
       def compile
-        push "if ("
+        push 'if ('
 
         when_checks.each_with_index do |check, idx|
           push ' || ' unless idx == 0
 
           if check.type == :splat
-            push "(function($splt) { for (var i = 0, ii = $splt.length; i < ii; i++) {"
+            push '(function($splt) { for (var i = 0, ii = $splt.length; i < ii; i++) {'
             if case_stmt[:cond]
               push "if ($splt[i]['$===']($case)) { return true; }"
             else
-              push "if (", js_truthy(check), ")) { return true; }"
+              push 'if (', js_truthy(check), ')) { return true; }'
             end
-            push "} return false; })(", expr(check.children[0]), ")"
+            push '} return false; })(', expr(check.children[0]), ')'
+          elsif case_stmt[:cond]
+            call = s(:send, check, :===, s(:arglist, s(:js_tmp, '$case')))
+            push expr(call)
           else
-            if case_stmt[:cond]
-              call = s(:send, check, :===, s(:arglist, s(:js_tmp, '$case')))
-              push expr(call)
-            else
-              push js_truthy(check)
-            end
+            push js_truthy(check)
           end
         end
 
-        push ") {", process(body_code, @level), "}"
+        push ') {', process(body_code, @level), '}'
       end
 
       def when_checks

data/lib/opal/nodes/class.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'opal/nodes/module'
 
 module Opal
@@ -12,13 +13,11 @@ module Opal
         name, base = name_and_base
         helper :klass
 
-        push "(function($base, $super, $parent_nesting) {"
-        line "  function $#{name}(){};"
-        line "  var self = $#{name} = $klass($base, $super, '#{name}', $#{name});"
+        push '(function($base, $super, $parent_nesting) {'
+        line "  var self = $klass($base, $super, '#{name}');"
 
         in_scope do
           scope.name = name
-          add_temp "#{scope.proto} = self.$$proto"
           add_temp '$nesting = [self].concat($parent_nesting)'
 
           body_code = self.body_code
@@ -28,7 +27,7 @@ module Opal
           line body_code
         end
 
-        line "})(", base, ", ", self.super_code, ", $nesting)"
+        line '})(', base, ', ', super_code, ', $nesting)'
       end
 
       def super_code

data/lib/opal/nodes/constants.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'opal/nodes/base'
 
 module Opal
@@ -10,13 +11,13 @@ module Opal
 
       def compile
         if magical_data_const?
-          push("$__END__")
+          push('$__END__')
         elsif const_scope
-          push "Opal.const_get_qualified(", recv(const_scope), ", '#{name}')"
+          push '$$$(', recv(const_scope), ", '#{name}')"
         elsif compiler.eval?
-          push "Opal.const_get_relative($nesting, '#{name}')"
+          push "$$($nesting, '#{name}')"
         else
-          push "Opal.const_get_relative($nesting, '#{name}')"
+          push "$$($nesting, '#{name}')"
         end
       end
 
@@ -27,7 +28,7 @@ module Opal
       # 2. When current file doesn't have __END__ section
       #    DATA const should be resolved to a regular ::DATA constant
       def magical_data_const?
-        const_scope.nil? && name == :DATA and compiler.eof_content
+        const_scope.nil? && name == :DATA && compiler.eof_content
       end
     end
 
@@ -48,9 +49,9 @@ module Opal
 
       def compile
         if base
-          push "Opal.const_set(", expr(base), ", '#{name}', ", expr(value), ")"
+          push 'Opal.const_set(', expr(base), ", '#{name}', ", expr(value), ')'
         else
-          push "Opal.const_set($nesting[0], '#{name}', ", expr(value), ")"
+          push "Opal.const_set($nesting[0], '#{name}', ", expr(value), ')'
         end
       end
     end

data/lib/opal/nodes/csend.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
+
 require 'opal/nodes/call'
 
 module Opal
   module Nodes
-
     # Safe navigator recv&.meth(arglist, &block)
     class CSendNode < CallNode
       handle :csend
@@ -12,7 +12,7 @@ module Opal
         helper :send
 
         conditional_send(recv(receiver_sexp)) do |receiver_temp|
-          push "$send(", receiver_temp
+          push '$send(', receiver_temp
           compile_method_name
           compile_arguments
           compile_block_pass
@@ -20,6 +20,5 @@ module Opal
         end
       end
     end
-
   end
 end

data/lib/opal/nodes/def.rb

@@ -1,78 +1,40 @@
 # frozen_string_literal: true
+
 require 'opal/nodes/node_with_args'
 
 module Opal
   module Nodes
-    # FIXME: needs rewrite
     class DefNode < NodeWithArgs
       handle :def
 
-      children :mid, :args, :stmts
-
-      attr_accessor :block_arg
-
-      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, [
-            mid,
-            s(:args, *regular_args),
-            stmts
-          ])
-        end
-      end
+      children :mid, :inline_args, :stmts
 
       def compile
-        extract_block_arg
-        split_args
-
         inline_params = nil
         scope_name = nil
 
-        # block name (&block)
-        if block_arg
-          block_name = block_arg
-        end
-
         in_scope do
           scope.mid = mid
           scope.defs = true if @sexp.type == :defs
 
-          if block_name
-            scope.uses_block!
-            scope.add_arg block_name
-          end
+          scope.identify!
+          scope_name = scope.identity
 
-          scope.block_name = block_name || '$yield'
+          # Setting a default block name (later can be overwritten by a blockarg)
+          scope.block_name = '$yield'
 
-          inline_params = process(inline_args_sexp)
+          inline_params = process(inline_args)
 
           stmt_code = stmt(compiler.returns(stmts))
 
-          add_temp 'self = this'
-
-          compile_inline_args
-          compile_post_args
-
-          scope.identify!
-          scope_name = scope.identity
-
           compile_block_arg
 
-          if compiler.arity_check?
-            compile_arity_check
-          end
+          add_temp 'self = this'
+
+          compile_arity_check
 
           if scope.uses_zuper
-            add_local '$zuper'
-            add_local '$zuper_i'
-            add_local '$zuper_ii'
-
-            line "// Prepare super implicit arguments"
-            line "for($zuper_i = 0, $zuper_ii = arguments.length, $zuper = new Array($zuper_ii); $zuper_i < $zuper_ii; $zuper_i++) {"
-            line "  $zuper[$zuper_i] = arguments[$zuper_i];"
-            line "}"
+            prepare_super
           end
 
           unshift "\n#{current_indent}", scope.to_vars
@@ -81,8 +43,8 @@ module Opal
 
           if scope.catch_return
             unshift "try {\n"
-            line "} catch ($returner) { if ($returner === Opal.returner) { return $returner.$v }"
-            push " throw $returner; }"
+            line '} catch ($returner) { if ($returner === Opal.returner) { return $returner.$v }'
+            push ' throw $returner; }'
           end
         end
 
@@ -96,11 +58,11 @@ module Opal
         # For now we're just using $$, to maintain compatibility with older IEs.
         function_name = valid_name?(mid) ? " $$#{mid}" : ''
 
-        unshift ") {"
+        unshift ') {'
         unshift(inline_params)
         unshift "function#{function_name}("
         unshift "#{scope_name} = " if scope_name
-        line "}"
+        line '}'
 
         push ", #{scope_name}.$$arity = #{arity}"
 
@@ -120,16 +82,7 @@ module Opal
       end
 
       def wrap_with_definition
-        if    scope.iter?                   then unshift "Opal.def(self, '$#{mid}', "
-        elsif scope.module? || scope.class? then unshift "Opal.defn(self, '$#{mid}', "
-        elsif scope.sclass?                 then unshift "Opal.defn(self, '$#{mid}', "
-        elsif compiler.eval?                then unshift "Opal.def(self, '$#{mid}', "
-        elsif scope.top?                    then unshift "Opal.defn(Opal.Object, '$#{mid}', "
-        elsif scope.def?                    then unshift "Opal.def(self, '$#{mid}', "
-        else raise "Unsupported use of `def`; please file a bug at https://github.com/opal/opal/issues/new reporting this message."
-        end
-
-        push ')'
+        wrap "Opal.def(self, '$#{mid}', ", ')'
 
         if expr?
           wrap '(', ", nil) && '#{mid}'"
@@ -138,25 +91,26 @@ module Opal
         end
       end
 
-      # Returns code used in debug mode to check arity of method call
-      def compile_arity_check
-        if arity_checks.size > 0
-          meth = scope.mid.to_s.inspect
-          line "var $arity = arguments.length;"
-          push " if (#{arity_checks.join(' || ')}) { Opal.ac($arity, #{arity}, this, #{meth}); }"
-        end
-      end
-
       def source_location
         file = @sexp.loc.expression.source_buffer.name
         line = @sexp.loc.line
-
-        "['#{file}.rb', #{line}]"
+        "['#{file}', #{line}]"
       end
 
       def comments_code
         '[' + comments.map { |comment| comment.text.inspect }.join(', ') + ']'
       end
+
+      def prepare_super
+        add_local '$zuper'
+        add_local '$zuper_i'
+        add_local '$zuper_ii'
+
+        line '// Prepare super implicit arguments'
+        line 'for($zuper_i = 0, $zuper_ii = arguments.length, $zuper = new Array($zuper_ii); $zuper_i < $zuper_ii; $zuper_i++) {'
+        line '  $zuper[$zuper_i] = arguments[$zuper_i];'
+        line '}'
+      end
     end
   end
 end