opal 1.2.0 → 1.3.0.alpha1

data/lib/opal/nodes/rescue.rb

@@ -49,7 +49,13 @@ module Opal
 
         line '}'
 
-        wrap '(function() { ', '; })()' if wrap_in_closure?
+        if wrap_in_closure?
+          if scope.await_encountered
+            wrap '(await (async function() { ', '; })())'
+          else
+            wrap '(function() { ', '; })()'
+          end
+        end
       end
 
       def body_sexp
@@ -88,49 +94,59 @@ module Opal
           line 'var $no_errors = true;'
         end
 
-        push 'try {'
-        indent do
-          line stmt(body_code)
-        end
-        line '} catch ($err) {'
-
-        indent do
-          if has_rescue_else?
-            line '$no_errors = false;'
+        in_rescue(self) do
+          push 'try {'
+          indent do
+            line stmt(body_code)
           end
+          line '} catch ($err) {'
 
-          children[1..-1].each_with_index do |child, idx|
-            # counting only rescue, ignoring rescue-else statement
-            next unless child && child.type == :resbody
-            _has_rescue_handlers = true
+          indent do
+            if has_rescue_else?
+              line '$no_errors = false;'
+            end
 
-            push ' else ' unless idx == 0
-            line process(child, @level)
-          end
+            children[1..-1].each_with_index do |child, idx|
+              # counting only rescue, ignoring rescue-else statement
+              next unless child && child.type == :resbody
+              _has_rescue_handlers = true
 
-          # if no resbodys capture our error, then rethrow
-          push ' else { throw $err; }'
-        end
+              push ' else ' unless idx == 0
+              line process(child, @level)
+            end
 
-        line '}'
+            # if no resbodys capture our error, then rethrow
+            push ' else { throw $err; }'
+          end
 
-        if handle_rescue_else_manually?
-          # here we must add 'finally' explicitly
-          push 'finally {'
-          indent do
-            line 'if ($no_errors) { '
+          line '}'
+
+          if handle_rescue_else_manually?
+            # here we must add 'finally' explicitly
+            push 'finally {'
             indent do
-              line stmt(rescue_else_code)
+              line 'if ($no_errors) { '
+              indent do
+                line stmt(rescue_else_code)
+              end
+              line '}'
             end
-            line '}'
+            push '}'
           end
-          push '}'
+
+          wrap "#{retry_id}: do { ", ' break; } while(1)' if retry_id
         end
 
         # Wrap a try{} catch{} into a function
         # when it's an expression
         # or when there's a method call after begin;rescue;end
-        wrap '(function() { ', '})()' if expr? || recv?
+        if expr? || recv?
+          if scope.await_encountered
+            wrap '(await (async function() { ', '})())'
+          else
+            wrap '(function() { ', '})()'
+          end
+        end
       end
 
       def body_code
@@ -149,8 +165,14 @@ module Opal
       #  wrapping current rescue.
       #
       def handle_rescue_else_manually?
-        !scope.in_ensure? && scope.has_rescue_else?
+        !in_ensure? && has_rescue_else?
       end
+
+      def gen_retry_id
+        @retry_id ||= scope.gen_retry_id
+      end
+
+      attr_reader :retry_id
     end
 
     class ResBodyNode < Base
@@ -168,9 +190,11 @@ module Opal
           # Need to ensure we clear the current exception out after the rescue block ends
           line 'try {'
           indent do
-            line stmt(rescue_body)
+            in_resbody do
+              line stmt(rescue_body)
+            end
           end
-          line '} finally { Opal.pop_exception() }'
+          line '} finally { Opal.pop_exception(); }'
         end
         line '}'
       end
@@ -190,7 +214,8 @@ module Opal
       handle :retry
 
       def compile
-        push stmt(s(:send, nil, :retry))
+        error 'Invalid retry' unless in_resbody?
+        push "continue #{scope.current_rescue.gen_retry_id}"
       end
     end
   end

data/lib/opal/nodes/scope.rb

@@ -27,11 +27,7 @@ module Opal
       # used by modules to know what methods to donate to includees
       attr_reader :methods
 
-      # uses parents super method
-      attr_accessor :uses_super
-      attr_accessor :uses_zuper
-
-      attr_accessor :catch_return, :has_break
+      attr_accessor :catch_return, :has_break, :has_retry
 
       attr_accessor :rescue_else_sexp
 
@@ -92,6 +88,11 @@ module Opal
         @type == :top
       end
 
+      # Traverses to the top scope.
+      def top_scope
+        top? ? self : parent.top_scope
+      end
+
       # True if a block/iter scope
       def iter?
         @type == :iter
@@ -101,6 +102,24 @@ module Opal
         @type == :def || @type == :defs
       end
 
+      def lambda?
+        iter? && @is_lambda
+      end
+
+      def is_lambda! # rubocop:disable Naming/PredicateName
+        @is_lambda = true
+      end
+
+      def defines_lambda
+        @lambda_definition = true
+        yield
+        @lambda_definition = false
+      end
+
+      def lambda_definition?
+        @lambda_definition
+      end
+
       # Is this a normal def method directly inside a class? This is
       # used for optimizing ivars as we can set them to nil in the
       # class body
@@ -170,6 +189,10 @@ module Opal
         false
       end
 
+      def scope_locals
+        @locals | @args | (@parent && @type == :iter ? @parent.scope_locals : [])
+      end
+
       def add_scope_temp(tmp)
         return if has_temp?(tmp)
 
@@ -241,7 +264,7 @@ module Opal
       def find_parent_def
         scope = self
         while scope = scope.parent
-          if scope.def?
+          if scope.def? || scope.lambda?
             return scope
           end
         end
@@ -277,6 +300,34 @@ module Opal
         !rescue_else_sexp.nil?
       end
 
+      def in_rescue(node)
+        @rescues ||= []
+
+        @rescues.push(node)
+        result = yield
+        @rescues.pop
+
+        result
+      end
+
+      def current_rescue
+        @rescues.last
+      end
+
+      def in_resbody
+        return unless block_given?
+
+        @in_resbody = true
+        result = yield
+        @in_resbody = false
+
+        result
+      end
+
+      def in_resbody?
+        @in_resbody
+      end
+
       def in_ensure
         return unless block_given?
 
@@ -290,6 +341,37 @@ module Opal
       def in_ensure?
         @in_ensure
       end
+
+      def gen_retry_id
+        @next_retry_id ||= 'retry_0'
+        @next_retry_id = @next_retry_id.succ
+      end
+
+      def accepts_using?
+        # IterNode of a special kind of Module.new {} is accepted...
+        # though we don't check for it that thoroughly.
+        [TopNode, ModuleNode, ClassNode, IterNode].include? self.class
+      end
+
+      def collect_refinements_temps(temps = [])
+        temps << @refinements_temp if @refinements_temp
+        return parent.collect_refinements_temps(temps) if parent
+        temps
+      end
+
+      def new_refinements_temp
+        var = compiler.unique_temp("$refn")
+        add_scope_local(var)
+        var
+      end
+
+      def refinements_temp
+        prev, curr = @refinements_temp, new_refinements_temp
+        @refinements_temp = curr
+        [prev, curr]
+      end
+
+      attr_accessor :await_encountered
     end
   end
 end

data/lib/opal/nodes/super.rb

@@ -48,20 +48,12 @@ module Opal
         @def_scope ||= scope.def? ? scope : scope.find_parent_def
       end
 
-      def raise_exception?
-        @sexp.type == :defined_super
-      end
-
       def defined_check_param
-        raise_exception? ? 'true' : 'false'
-      end
-
-      def implicit_args?
-        @sexp.type == :zsuper
+        'false'
       end
 
       def implicit_arguments_param
-        implicit_args? ? 'true' : 'false'
+        'false'
       end
 
       def method_id
@@ -73,17 +65,19 @@ module Opal
       end
 
       def allow_stubs
-        true
+        'true'
       end
 
       def super_method_invocation
-        "Opal.find_super_dispatcher(self, '#{method_id}', #{def_scope_identity}, #{defined_check_param}, #{allow_stubs})"
+        helper :find_super
+        "$find_super(self, '#{method_id}', #{def_scope_identity}, #{defined_check_param}, #{allow_stubs})"
       end
 
       def super_block_invocation
+        helper :find_block_super
         chain, cur_defn, mid = scope.super_chain
         trys = chain.map { |c| "#{c}.$$def" }.join(' || ')
-        "Opal.find_iter_super_dispatcher(self, #{mid}, (#{trys} || #{cur_defn}), #{defined_check_param}, #{implicit_arguments_param})"
+        "$find_block_super(self, #{mid}, (#{trys} || #{cur_defn}), #{defined_check_param}, #{implicit_arguments_param})"
       end
 
       def compile_method_body
@@ -111,7 +105,11 @@ module Opal
       handle :defined_super
 
       def allow_stubs
-        false
+        'false'
+      end
+
+      def defined_check_param
+        'true'
       end
 
       def compile
@@ -122,7 +120,7 @@ module Opal
       end
     end
 
-    # super with implicit args
+    # super with explicit args
     class SuperNode < BaseSuperNode
       handle :super
 
@@ -139,10 +137,14 @@ module Opal
       end
     end
 
-    # super with explicit args
+    # super with implicit args
     class ZsuperNode < SuperNode
       handle :zsuper
 
+      def implicit_arguments_param
+        'true'
+      end
+
       def initialize(*)
         super
 
@@ -157,8 +159,7 @@ module Opal
 
       def compile
         if def_scope
-          def_scope.uses_zuper = true
-          implicit_args = [s(:js_tmp, '$zuper')]
+          implicit_args = implicit_arglist
           # 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_name && !iter
@@ -172,14 +173,40 @@ module Opal
         compile_using_send
       end
 
-      def compile_arguments
-        push ', '
-
-        if arglist.children.empty?
-          push '[]'
-        else
-          push expr(arglist)
+      def implicit_arglist
+        args = []
+        kwargs = []
+        same_arg_counter = Hash.new(0)
+
+        def_scope.original_args.children.each do |sexp|
+          arg_name = sexp.meta[:arg_name]
+
+          case sexp.type
+          when :arg, :optarg
+            arg_node = s(:lvar, arg_name)
+            #   def m(_, _)
+            # is compiled to
+            #   function $$m(_, __$2)
+            # See Opal::Node::ArgsNode
+            if arg_name[0] == '_'
+              same_arg_counter[arg_name] += 1
+              arg_node = s(:js_tmp, "#{arg_name}_$#{same_arg_counter[arg_name]}") if same_arg_counter[arg_name] > 1
+            end
+
+            args << arg_node
+          when :restarg
+            arg_node = arg_name ? s(:lvar, arg_name) : s(:js_tmp, '$rest_arg')
+            args << s(:splat, arg_node)
+          when :kwarg, :kwoptarg
+            kwargs << s(:pair, s(:sym, arg_name), s(:lvar, arg_name))
+          when :kwrestarg
+            arg_node = arg_name ? s(:lvar, arg_name) : s(:js_tmp, '$kw_rest_arg')
+            kwargs << s(:kwsplat, arg_node)
+          end
         end
+
+        args << s(:hash, *kwargs) unless kwargs.empty?
+        args
       end
 
       def block_name

data/lib/opal/nodes/top.rb

@@ -15,7 +15,6 @@ module Opal
       def compile
         push version_comment
 
-        opening
         in_scope do
           line '"use strict";' if compiler.use_strict?
 
@@ -42,17 +41,24 @@ module Opal
 
           line body_code
         end
-
+        opening
         closing
       end
 
       def opening
+        as = ""
+        if await_encountered
+          as = "async "
+        end
+
         if compiler.requirable?
-          line "Opal.modules[#{Opal::Compiler.module_name(compiler.file).inspect}] = function(Opal) {"
+          unshift "Opal.modules[#{Opal::Compiler.module_name(compiler.file).inspect}] = #{as}function(Opal) {"
         elsif compiler.eval?
-          line '(function(Opal, self) {'
+          unshift "(#{as}function(Opal, self) {"
+        elsif compiler.esm?
+          unshift "export default Opal.queue(#{as}function(Opal) {"
         else
-          line '(function(Opal) {'
+          unshift "Opal.queue(#{as}function(Opal) {"
         end
       end
 
@@ -60,9 +66,9 @@ module Opal
         if compiler.requirable?
           line "};\n"
         elsif compiler.eval?
-          line '})(Opal, self)'
+          line "})(Opal, self);"
         else
-          line "})(Opal);\n"
+          line "});\n"
         end
       end
 

data/lib/opal/nodes/while.rb

@@ -26,7 +26,13 @@ module Opal
           end
         end
 
-        wrap '(function() {', '; return nil; })()' if wrap_in_closure?
+        if wrap_in_closure?
+          if scope.await_encountered
+            wrap '(await (async function() {', '; return nil; })())'
+          else
+            wrap '(function() {', '; return nil; })()'
+          end
+        end
       end
 
       private

data/lib/opal/parser/patch.rb

@@ -41,7 +41,8 @@ if RUBY_ENGINE == 'opal'
 
   class Parser::Builders::Default
     def check_lvar_name(name, loc)
-      if name =~ `/^[\p{Ll}|_][\p{L}\p{Nl}\p{Nd}_]*$/u`
+      # https://javascript.info/regexp-unicode
+      if name =~ `new RegExp('^[\\p{Ll}|_][\\p{L}\\p{Nl}\\p{Nd}_]*$', 'u')`
         # OK
       else
         diagnostic :error, :lvar_name, { name: name }, loc