opal 1.3.2 → 1.4.0.alpha1

data/lib/opal/compiler.rb

@@ -205,6 +205,9 @@ module Opal
     # Current scope
     attr_accessor :scope
 
+    # Top scope
+    attr_accessor :top_scope
+
     # Current case_stmt
     attr_reader :case_stmt
 
@@ -284,11 +287,6 @@ module Opal
       )
     end
 
-    # Operator helpers
-    def operator_helpers
-      @operator_helpers ||= Set.new
-    end
-
     # Method calls made in this file
     def method_calls
       @method_calls ||= Set.new

data/lib/opal/fragment.rb

@@ -106,7 +106,11 @@ module Opal
           @sexp
         end
       when @sexp.type == :iter
-        @sexp.loc.begin # [1,2].each >{ }
+        if loc.respond_to? :begin
+          @sexp.loc.begin # [1,2].each >{ }
+        else
+          @sexp
+        end
       else
         @sexp
       end

data/lib/opal/nodes/args/extract_block_arg.rb

@@ -18,15 +18,8 @@ module Opal
         def compile
           scope.uses_block!
           scope.add_arg name
-          scope.block_name = name
 
-          scope_name  = scope.identity
-          yielder     = scope.block_name
-
-          add_temp "$iter = #{scope_name}.$$p"
-          add_temp "#{yielder} = $iter || nil"
-
-          line "if ($iter) #{scope_name}.$$p = null;"
+          scope.prepare_block(name)
         end
       end
     end

data/lib/opal/nodes/args/extract_kwoptarg.rb

@@ -25,9 +25,7 @@ module Opal
 
           return if default_value.children[1] == :undefined
 
-          line "if (#{lvar_name} == null) {"
-          line "  #{lvar_name} = ", expr(default_value)
-          line "}"
+          line "if (#{lvar_name} == null) #{lvar_name} = ", expr(default_value)
         end
       end
     end

data/lib/opal/nodes/args/extract_optarg.rb

@@ -25,9 +25,7 @@ module Opal
         def compile
           return if default_value.children[1] == :undefined
 
-          line "if (#{name} == null) {"
-          line "  #{name} = ", expr(default_value), ";"
-          line "}"
+          line "if (#{name} == null) #{name} = ", expr(default_value), ";"
         end
       end
     end

data/lib/opal/nodes/args/extract_post_arg.rb

@@ -15,12 +15,9 @@ module Opal
         def compile
           add_temp name
 
-          line "#{name} = $post_args[0];"
-          line "$post_args.splice(0, 1);"
+          line "#{name} = $post_args.shift();"
 
-          line "if (#{name} == null) {"
-          line "  #{name} = nil"
-          line "}"
+          line "if (#{name} == null) #{name} = nil;"
         end
       end
     end

data/lib/opal/nodes/args/extract_post_optarg.rb

@@ -24,16 +24,11 @@ module Opal
         def compile
           add_temp name
 
-          line "if ($post_args.length > #{args_to_keep}) {"
-          line "  #{name} = $post_args[0];"
-          line "  $post_args.splice(0, 1);"
-          line "}"
+          line "if ($post_args.length > #{args_to_keep}) #{name} = $post_args.shift();"
 
           return if default_value.children[1] == :undefined
 
-          line "if (#{name} == null) {"
-          line "  #{name} = ", expr(default_value), ";"
-          line "}"
+          line "if (#{name} == null) #{name} = ", expr(default_value), ";"
         end
       end
     end

data/lib/opal/nodes/args/initialize_iterarg.rb

@@ -18,9 +18,7 @@ module Opal
         children :name
 
         def compile
-          line "if (#{name} == null) {"
-          line "  #{name} = nil;"
-          line "}"
+          line "if (#{name} == null) #{name} = nil;"
         end
       end
     end

data/lib/opal/nodes/args/prepare_post_args.rb

@@ -14,7 +14,11 @@ module Opal
         def compile
           add_temp '$post_args'
 
-          line "$post_args = Opal.slice.call(arguments, #{offset}, arguments.length)"
+          if offset == 0
+            line "$post_args = Opal.slice.call(arguments)"
+          else
+            line "$post_args = Opal.slice.call(arguments, #{offset})"
+          end
         end
       end
     end

data/lib/opal/nodes/base.rb

@@ -36,6 +36,7 @@ module Opal
         @type = sexp.type
         @level = level
         @compiler = compiler
+        @compiler.top_scope ||= self
       end
 
       def children
@@ -86,7 +87,7 @@ module Opal
       end
 
       def top_scope
-        scope.top_scope
+        @compiler.top_scope
       end
 
       def s(type, *children)
@@ -199,7 +200,7 @@ module Opal
 
       def class_variable_owner
         if scope
-          "$nesting[#{class_variable_owner_nesting_level}]"
+          "#{scope.nesting}[#{class_variable_owner_nesting_level}]"
         else
           'Opal.Object'
         end

data/lib/opal/nodes/call.rb

@@ -252,9 +252,11 @@ module Opal
 
       OPERATORS.each do |operator, name|
         add_special(operator.to_sym) do |compile_default|
-          if compiler.inline_operators?
+          if invoke_using_refinement?
+            compile_default.call
+          elsif compiler.inline_operators?
             compiler.method_calls << operator.to_sym if record_method?
-            compiler.operator_helpers << operator.to_sym
+            helper :"rb_#{name}"
             lhs, rhs = expr(recvr), expr(arglist)
 
             push fragment("$rb_#{name}(")
@@ -281,7 +283,7 @@ module Opal
           dir = File.dirname(file)
           compiler.requires << Pathname(dir).join(arg.children[0]).cleanpath.to_s
         end
-        push fragment("self.$require(#{file.inspect}+ '/../' + ")
+        push fragment("#{scope.self}.$require(#{file.inspect}+ '/../' + ")
         push process(arglist)
         push fragment(')')
       end
@@ -351,9 +353,9 @@ module Opal
       def using_refinement(arg)
         prev, curr = *scope.refinements_temp
         if prev
-          push "(#{curr} = #{prev}.slice(), #{curr}.push(", expr(arg), '), self)'
+          push "(#{curr} = #{prev}.slice(), #{curr}.push(", expr(arg), "), #{scope.self})"
         else
-          push "(#{curr} = [", expr(arg), '], self)'
+          push "(#{curr} = [", expr(arg), "], #{scope.self})"
         end
       end
 
@@ -373,14 +375,14 @@ module Opal
 
       add_special :nesting do |compile_default|
         push_nesting = push_nesting?
-        push '(Opal.Module.$$nesting = $nesting, ' if push_nesting
+        push "(Opal.Module.$$nesting = #{scope.nesting}, " if push_nesting
         compile_default.call
         push ')' if push_nesting
       end
 
       add_special :constants do |compile_default|
         push_nesting = push_nesting?
-        push '(Opal.Module.$$nesting = $nesting, ' if push_nesting
+        push "(Opal.Module.$$nesting = #{scope.nesting}, " if push_nesting
         compile_default.call
         push ')' if push_nesting
       end
@@ -390,18 +392,27 @@ module Opal
       add_special :eval do |compile_default|
         next compile_default.call if arglist.children.length != 1 || ![s(:self), nil].include?(recvr)
 
+        scope.nesting
         temp = scope.new_temp
         scope_variables = scope.scope_locals.map(&:to_s).inspect
         push "(#{temp} = ", expr(arglist)
         push ", typeof Opal.compile === 'function' ? eval(Opal.compile(#{temp}"
         push ', {scope_variables: ', scope_variables
         push ", arity_check: #{compiler.arity_check?}, file: '(eval)', eval: true})) : "
-        push "self.$eval(#{temp}))"
+        push "#{scope.self}.$eval(#{temp}))"
+      end
+
+      add_special :local_variables do |compile_default|
+        next compile_default.call unless [s(:self), nil].include?(recvr)
+
+        scope_variables = scope.scope_locals.map(&:to_s).inspect
+        push scope_variables
       end
 
       add_special :binding do |compile_default|
         next compile_default.call unless recvr.nil?
 
+        scope.nesting
         push "Opal.Binding.$new("
         push "  function($code, $value) {"
         push "    if (typeof $value === 'undefined') {"
@@ -412,7 +423,7 @@ module Opal
         push "    }"
         push "  },"
         push "  ", scope.scope_locals.map(&:to_s).inspect, ","
-        push "  self,"
+        push "  ", scope.self, ","
         push "  ", source_location
         push ")"
       end

data/lib/opal/nodes/call_special.rb

@@ -69,6 +69,56 @@ module Opal
 
       def compile
         sexp = s(:send, lhs, :=~, rhs)
+        # Handle named matches like: /(?<abc>b)/ =~ 'b'
+        if lhs.type == :regexp && lhs.children.first.type == :str
+          re = lhs.children.first.children.first
+          names = re.scan(/\(\?<([^>]*)>/).flatten.map(&:to_sym)
+          unless names.empty?
+            # $m3names = $~ ? $~.named_captures : {}
+            names_def = s(:lvasgn, :$m3names,
+              s(:if,
+                s(:gvar, :$~),
+                s(:send, s(:gvar, :$~), :named_captures),
+                s(:hash)
+              )
+            )
+
+            names = names.map do |name|
+              # abc = $m3names[:abc]
+              s(:lvasgn, name,
+                s(:send,
+                  s(:lvar, :$m3names),
+                  :[],
+                  s(:sym, name)
+                )
+              )
+            end
+
+            if stmt?
+              # We don't care about a return value of this one, so we
+              # ignore it and just assign the local variables.
+              #
+              # (/(?<abc>b)/ =~ 'f')
+              # $m3names = $~ ? $~.named_captures : {}
+              # abc = $m3names[:abc]
+              sexp = s(:begin, sexp, names_def, *names)
+            else
+              # We actually do care about a return value, so we must
+              # keep it saved.
+              #
+              # $m3tmp = (/(?<abc>b)/ =~ 'f')
+              # $m3names = $~ ? $~.named_captures : {}
+              # abc = $m3names[:abc]
+              # $m3tmp
+              sexp = s(:begin,
+                s(:lvasgn, :$m3tmp, sexp),
+                names_def,
+                *names,
+                s(:lvar, :$m3tmp)
+              )
+            end
+          end
+        end
         push process(sexp, @level)
       end
     end

data/lib/opal/nodes/class.rb

@@ -13,23 +13,32 @@ module Opal
         name, base = name_and_base
         helper :klass
 
-        line "  var self = $klass($base, $super, '#{name}');"
-        in_scope do
-          scope.name = name
-          compile_body
-        end
-
-        if await_encountered
-          await_begin = '(await '
-          await_end = ')'
-          async = 'async '
-          parent.await_encountered = true
+        if body.nil?
+          # Simplified compile for empty body
+          if stmt?
+            unshift '$klass(', base, ', ', super_code, ", '#{name}')"
+          else
+            unshift '($klass(', base, ', ', super_code, ", '#{name}'), nil)"
+          end
         else
-          await_begin, await_end, async = '', '', ''
+          line "  var self = $klass($base, $super, '#{name}');"
+          in_scope do
+            scope.name = name
+            compile_body
+          end
+
+          if await_encountered
+            await_begin = '(await '
+            await_end = ')'
+            async = 'async '
+            parent.await_encountered = true
+          else
+            await_begin, await_end, async = '', '', ''
+          end
+
+          unshift "#{await_begin}(#{async}function($base, $super#{', $parent_nesting' if @define_nesting}) {"
+          line '})(', base, ', ', super_code, "#{', ' + scope.nesting if @define_nesting})#{await_end}"
         end
-
-        unshift "#{await_begin}(#{async}function($base, $super, $parent_nesting) {"
-        line '})(', base, ', ', super_code, ", $nesting)#{await_end}"
       end
 
       def super_code

data/lib/opal/nodes/constants.rb

@@ -12,12 +12,17 @@ module Opal
       def compile
         if magical_data_const?
           push('$__END__')
+        elsif optimized_access?
+          helper :"#{name}"
+          push "$#{name}"
+        elsif const_scope == s(:cbase)
+          push "#{top_scope.absolute_const}('#{name}')"
         elsif const_scope
-          push '$$$(', recv(const_scope), ", '#{name}')"
+          push "#{top_scope.absolute_const}(", recv(const_scope), ", '#{name}')"
         elsif compiler.eval?
-          push "$$($nesting, '#{name}')"
+          push "#{scope.relative_access}('#{name}')"
         else
-          push "$$($nesting, '#{name}')"
+          push "#{scope.relative_access}('#{name}')"
         end
       end
 
@@ -30,6 +35,17 @@ module Opal
       def magical_data_const?
         const_scope.nil? && name == :DATA && compiler.eof_content
       end
+
+      OPTIMIZED_ACCESS_CONSTS = %i[
+        BasicObject Object Module Class Opal Kernel NilClass
+      ].freeze
+
+      # For a certain case of calls like `::Opal.coerce_to?` we can
+      # optimize the calls. We can be sure they are defined from the
+      # beginning.
+      def optimized_access?
+        const_scope == s(:cbase) && OPTIMIZED_ACCESS_CONSTS.include?(name)
+      end
     end
 
     # ::CONST
@@ -48,10 +64,12 @@ module Opal
       children :base, :name, :value
 
       def compile
+        helper :const_set
+
         if base
-          push 'Opal.const_set(', expr(base), ", '#{name}', ", expr(value), ')'
+          push '$const_set(', expr(base), ", '#{name}', ", expr(value), ')'
         else
-          push "Opal.const_set($nesting[0], '#{name}', ", expr(value), ')'
+          push "$const_set(#{scope.nesting}[0], '#{name}', ", expr(value), ')'
         end
       end
     end

data/lib/opal/nodes/def.rb

@@ -29,7 +29,7 @@ module Opal
 
           compile_block_arg
 
-          add_temp 'self = this'
+          add_temp 'self = this' if @define_self
 
           compile_arity_check
 
@@ -44,50 +44,47 @@ module Opal
           end
         end
 
-        # There are some special utf8 chars that can be used as valid JS
-        # identifiers, some examples:
-        #
-        # utf8_pond = 'ⵌ'
-        # utf8_question = 'ʔ̣'
-        # utf8_exclamation 'ǃ'
-        #
-        # For now we're just using $$, to maintain compatibility with older IEs.
-        function_name = valid_name?(mid) ? " $$#{mid}" : ''
-
         unshift ') {'
         unshift(inline_params)
-        unshift "function#{function_name}("
+        unshift "function #{scope_name}("
         if await_encountered
           unshift "async "
         end
-        unshift "#{scope_name} = " if scope_name
         line '}'
 
-        push ", #{scope_name}.$$arity = #{arity}"
+        blockopts = []
+
+        blockopts << "$$arity: #{arity}"
 
         if compiler.arity_check?
-          push ", #{scope_name}.$$parameters = #{parameters_code}"
+          blockopts << "$$parameters: #{parameters_code}"
         end
 
         if compiler.parse_comments?
-          push ", #{scope_name}.$$comments = #{comments_code}"
+          blockopts << "$$comments: #{comments_code}"
         end
 
         if compiler.enable_source_location?
-          push ", #{scope_name}.$$source_location = #{source_location}"
+          blockopts << "$$source_location: #{source_location}"
+        end
+
+        if blockopts.length == 1
+          push ", #{arity}"
+        elsif blockopts.length > 1
+          push ', {', blockopts.join(', '), '}'
         end
 
         wrap_with_definition
+
+        scope.nesting if @define_nesting
+        scope.relative_access if @define_relative_access
       end
 
       def wrap_with_definition
-        wrap "Opal.def(self, '$#{mid}', ", ')'
+        helper :def
+        wrap "$def(#{scope.self}, '$#{mid}', ", ')'
 
-        if expr?
-          wrap '(', ", nil) && '#{mid}'"
-        else
-          unshift "\n#{current_indent}"
-        end
+        unshift "\n#{current_indent}" unless expr?
       end
 
       def comments_code

data/lib/opal/nodes/defined.rb

@@ -107,7 +107,7 @@ module Opal
           recv_tmp = scope.new_temp
           push "(#{recv_tmp} = ", recv_code, ", #{recv_tmp}) && "
         else
-          recv_tmp = 'self'
+          recv_tmp = scope.self
         end
 
         recv_value_tmp = scope.new_temp
@@ -139,7 +139,7 @@ module Opal
         # we can't tell if it was the user that put nil and made the ivar #defined?
         # or not.
         tmp = scope.new_temp
-        push "(#{tmp} = self['#{name}'], #{tmp} != null && #{tmp} !== nil)"
+        push "(#{tmp} = #{scope.self}['#{name}'], #{tmp} != null && #{tmp} !== nil)"
 
         tmp
       end
@@ -165,12 +165,12 @@ module Opal
         const_tmp = scope.new_temp
 
         if const_scope.nil?
-          push "(#{const_tmp} = $$($nesting, '#{const_name}', 'skip_raise'))"
+          push "(#{const_tmp} = #{scope.relative_access}('#{const_name}', 'skip_raise'))"
         elsif const_scope == s(:cbase)
-          push "(#{const_tmp} = $$$('::', '#{const_name}', 'skip_raise'))"
+          push "(#{const_tmp} = #{top_scope.absolute_const}('::', '#{const_name}', 'skip_raise'))"
         else
           const_scope_tmp = compile_defined(const_scope)
-          push " && (#{const_tmp} = $$$(#{const_scope_tmp}, '#{const_name}', 'skip_raise'))"
+          push " && (#{const_tmp} = #{top_scope.absolute_const}(#{const_scope_tmp}, '#{const_name}', 'skip_raise'))"
         end
         const_tmp
       end

data/lib/opal/nodes/definitions.rb

@@ -11,7 +11,7 @@ module Opal
 
       def compile
         children.each do |child|
-          line "Opal.udef(self, '$' + ", expr(child), ');'
+          line "Opal.udef(#{scope.self}, '$' + ", expr(child), ');'
         end
       end
     end
@@ -31,7 +31,7 @@ module Opal
           push '$alias_gvar(', new_name_str, ', ', old_name_str, ')'
         when :dsym, :sym # This is a method alias: alias a b
           helper :alias
-          push '$alias(self, ', expr(new_name), ', ', expr(old_name), ')'
+          push "$alias(#{scope.self}, ", expr(new_name), ', ', expr(old_name), ')'
         else # Nothing else is available, but just in case, drop an error
           error "Opal doesn't know yet how to alias with #{new_name.type}"
         end

data/lib/opal/nodes/defs.rb

@@ -9,12 +9,9 @@ module Opal
       children :recvr, :mid, :inline_args, :stmts
 
       def wrap_with_definition
-        unshift 'Opal.defs(', expr(recvr), ", '$#{mid}', "
+        helper :defs
+        unshift '$defs(', expr(recvr), ", '$#{mid}', "
         push ')'
-
-        if expr?
-          wrap '(', ", nil) && '#{mid}'"
-        end
       end
     end
   end

data/lib/opal/nodes/helpers.rb

@@ -52,23 +52,11 @@ module Opal
         [fragment('$truthy('), expr(sexp), fragment(')')]
       end
 
-      def js_falsy(sexp)
-        if sexp.type == :send
-          mid = sexp.children[1]
-          if mid == :block_given?
-            scope.uses_block!
-            return "#{scope.block_name} === nil"
-          end
-        end
-
-        helper :falsy
-        [fragment('$falsy('), expr(sexp), fragment(')')]
-      end
-
       def js_truthy_optimize(sexp)
-        if sexp.type == :send
-          mid = sexp.children[1]
-          receiver_handler_class = (receiver = sexp.children[0]) && compiler.handlers[receiver.type]
+        case sexp.type
+        when :send
+          receiver, mid, *args = *sexp
+          receiver_handler_class = receiver && compiler.handlers[receiver.type]
 
           # Only operator calls on the truthy_optimize? node classes should be optimized.
           # Monkey patch method calls might return 'self'/aka a bridged instance and need
@@ -78,8 +66,50 @@ module Opal
                                        receiver_handler_class.truthy_optimize?
 
           if allow_optimization_on_type ||
-             mid == :block_given? ||
-             mid == :"=="
+             mid == :block_given?
+            expr(sexp)
+          elsif args.count == 1
+            case mid
+            when :==
+              helper :eqeq
+              compiler.method_calls << mid
+              [fragment('$eqeq('), expr(receiver), fragment(', '), expr(args.first), fragment(')')]
+            when :===
+              helper :eqeqeq
+              compiler.method_calls << mid
+              [fragment('$eqeqeq('), expr(receiver), fragment(', '), expr(args.first), fragment(')')]
+            when :!=
+              helper :neqeq
+              compiler.method_calls << mid
+              [fragment('$neqeq('), expr(receiver), fragment(', '), expr(args.first), fragment(')')]
+            end
+          elsif args.count == 0
+            case mid
+            when :!
+              helper :not
+              compiler.method_calls << mid
+              [fragment('$not('), expr(receiver), fragment(')')]
+            end
+          end
+        when :begin
+          if sexp.children.count == 1
+            js_truthy_optimize(sexp.children.first)
+          end
+        when :if
+          _test, true_body, false_body = *sexp
+          if true_body == s(:true)
+            # Ensure we recurse the js_truthy call on the `false_body` of the if `expr`.
+            # This transforms an expression like:
+            #
+            # $truthy($truthy(a) || b)
+            #
+            # Into:
+            #
+            # $truthy(a) || $truthy(b)
+            sexp.meta[:do_js_truthy_on_false_body] = true
+            expr(sexp)
+          elsif false_body == s(:false)
+            sexp.meta[:do_js_truthy_on_true_body] = true
             expr(sexp)
           end
         end