opal 0.11.4 → 1.0.0.beta1

data/lib/opal/nodes.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'opal/nodes/base'
 require 'opal/nodes/literal'
 require 'opal/nodes/variables'
@@ -9,16 +10,8 @@ require 'opal/nodes/call_special'
 require 'opal/nodes/module'
 require 'opal/nodes/class'
 require 'opal/nodes/singleton_class'
-require 'opal/nodes/inline_args'
-require 'opal/nodes/args/normarg'
-require 'opal/nodes/args/optarg'
-require 'opal/nodes/args/mlhsarg'
-require 'opal/nodes/args/restarg'
-require 'opal/nodes/args/kwarg'
-require 'opal/nodes/args/kwoptarg'
-require 'opal/nodes/args/kwrestarg'
-require 'opal/nodes/args/post_kwargs'
-require 'opal/nodes/args/post_args'
+require 'opal/nodes/args'
+require 'opal/nodes/args/arity_check'
 require 'opal/nodes/iter'
 require 'opal/nodes/def'
 require 'opal/nodes/defs'
@@ -36,3 +29,5 @@ require 'opal/nodes/array'
 require 'opal/nodes/defined'
 require 'opal/nodes/masgn'
 require 'opal/nodes/arglist'
+require 'opal/nodes/x_string'
+require 'opal/nodes/lambda'

data/lib/opal/nodes/arglist.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'opal/nodes/base'
 
 module Opal
@@ -19,21 +20,21 @@ module Opal
               if code.empty?
                 code << arg
               else
-                code << fragment(".concat(") << arg << fragment(")")
+                code << fragment('.concat(') << arg << fragment(')')
               end
             else
               if code.empty?
-                code << fragment("[") << work << fragment("]")
+                code << fragment('[') << work << fragment(']')
               else
-                code << fragment(".concat([") << work << fragment("])")
+                code << fragment('.concat([') << work << fragment('])')
               end
 
-              code << fragment(".concat(") << arg << fragment(")")
+              code << fragment('.concat(') << arg << fragment(')')
             end
 
             work = []
           else
-            work << fragment(", ") unless work.empty?
+            work << fragment(', ') unless work.empty?
             work << arg
           end
         end
@@ -44,7 +45,7 @@ module Opal
           if code.empty?
             code = join
           else
-            code << fragment(".concat(") << join << fragment(")")
+            code << fragment('.concat([') << join << fragment('])')
           end
         end
 

data/lib/opal/nodes/args.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'opal/nodes/base'
+
+require 'opal/nodes/args/arg'
+require 'opal/nodes/args/arity_check'
+require 'opal/nodes/args/ensure_kwargs_are_kwargs'
+require 'opal/nodes/args/extract_block_arg'
+require 'opal/nodes/args/extract_kwarg'
+require 'opal/nodes/args/extract_kwargs'
+require 'opal/nodes/args/extract_kwoptarg'
+require 'opal/nodes/args/extract_kwrestarg'
+require 'opal/nodes/args/extract_optarg'
+require 'opal/nodes/args/extract_post_arg'
+require 'opal/nodes/args/extract_post_optarg'
+require 'opal/nodes/args/extract_restarg'
+require 'opal/nodes/args/fake_arg'
+require 'opal/nodes/args/initialize_iterarg'
+require 'opal/nodes/args/initialize_shadowarg'
+require 'opal/nodes/args/parameters'
+require 'opal/nodes/args/prepare_post_args'
+
+module Opal
+  module Nodes
+    class ArgsNode < Base
+      handle :args
+
+      def compile
+        children.each_with_index do |arg, idx|
+          push ', ' if idx != 0
+          push process(arg)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'opal/nodes/base'
+
+module Opal
+  module Nodes
+    module Args
+      # Compiles a single inline required argument
+      # def m(a); end
+      #       ^
+      class ArgNode < Base
+        handle :arg
+        children :name
+
+        def compile
+          scope.add_arg name
+          push name.to_s
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,151 @@
+# frozen_string_literal: true
+
+require 'opal/nodes/base'
+require 'opal/rewriters/arguments'
+
+module Opal
+  module Nodes
+    class ArityCheckNode < Base
+      handle :arity_check
+      children :args_node
+
+      def initialize(*)
+        super
+
+        arguments = Rewriters::Arguments.new(args_node.children)
+
+        @args      = arguments.args
+        @optargs   = arguments.optargs
+        @restarg   = arguments.restarg
+        @postargs  = arguments.postargs
+        @kwargs    = arguments.kwargs
+        @kwoptargs = arguments.kwoptargs
+        @kwrestarg = arguments.kwrestarg
+      end
+
+      def compile
+        scope.arity = arity
+
+        return unless compiler.arity_check?
+
+        unless arity_checks.empty?
+          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 kwargs
+        [*@kwargs, *@kwoptargs, @kwrestarg].compact
+      end
+
+      def all_args
+        @all_args ||= [*@args, *@optargs, @restarg, *@postargs, *kwargs].compact
+      end
+
+      # Returns an array of JS conditions for raising and argument
+      # error caused by arity check
+      def arity_checks
+        return @arity_checks if defined?(@arity_checks)
+
+        arity = all_args.size
+        arity -= @optargs.size
+
+        arity -= 1 if @restarg
+
+        arity -= kwargs.size
+
+        arity = -arity - 1 if !@optargs.empty? || !kwargs.empty? || @restarg
+
+        @arity_checks = []
+
+        if arity < 0 # splat or opt args
+          min_arity = -(arity + 1)
+          max_arity = all_args.size
+          @arity_checks << "$arity < #{min_arity}" if min_arity > 0
+          @arity_checks << "$arity > #{max_arity}" unless @restarg
+        else
+          @arity_checks << "$arity !== #{arity}"
+        end
+
+        @arity_checks
+      end
+
+      def arity
+        if @restarg || @optargs.any? || has_only_optional_kwargs?
+          negative_arity
+        else
+          positive_arity
+        end
+      end
+
+      def negative_arity
+        required_plain_args = all_args.select do |arg|
+          %i[arg mlhs].include?(arg.type)
+        end
+
+        result = required_plain_args.size
+
+        if has_required_kwargs?
+          result += 1
+        end
+
+        result = -result - 1
+
+        result
+      end
+
+      def positive_arity
+        result = all_args.size
+
+        result -= kwargs.size
+        result += 1 if kwargs.any?
+
+        result
+      end
+
+      def has_only_optional_kwargs?
+        kwargs.any? && kwargs.all? { |arg| %i[kwoptarg kwrestarg].include?(arg.type) }
+      end
+
+      def has_required_kwargs?
+        kwargs.any? { |arg| arg.type == :kwarg }
+      end
+    end
+
+    class IterArityCheckNode < ArityCheckNode
+      handle :iter_arity_check
+
+      def compile
+        scope.arity = arity
+
+        return unless compiler.arity_check?
+
+        unless arity_checks.empty?
+          parent_scope = scope
+          until parent_scope.def? || parent_scope.class_scope? || parent_scope.top?
+            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
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'opal/nodes/base'
+
+module Opal
+  module Nodes
+    module Args
+      # A utility node responsible for compiling
+      # a runtime validation for kwargs.
+      #
+      # This node is used for both inline and post-kwargs
+      #
+      class EnsureKwargsAreKwargs < Base
+        handle :ensure_kwargs_are_kwargs
+
+        def compile
+          helper :hash2
+
+          line 'if ($kwargs == null) {'
+          line '  $kwargs = $hash2([], {});'
+          line '} else if (!$kwargs.$$is_hash) {'
+          line "  throw Opal.ArgumentError.$new('expected kwargs');"
+          line '}'
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'opal/nodes/base'
+
+module Opal
+  module Nodes
+    module Args
+      # Compiles extraction of the block argument
+      # def m(&block); end
+      #       ^^^^^^
+      #
+      # This node doesn't exist in the original AST,
+      # InlineArgs rewriter creates it to simplify compilation
+      class ExtractBlockarg < Base
+        handle :extract_blockarg
+        children :name
+
+        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;"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'opal/nodes/base'
+
+module Opal
+  module Nodes
+    module Args
+      # This node is responsible for extracting a single
+      # required keyword argument from $kwargs
+      #
+      # $kwargs always exist (as argument when inlining is possible
+      # and as a local variable when it's not)
+      #
+      class ExtractKwarg < Base
+        handle :extract_kwarg
+        children :lvar_name
+
+        def compile
+          key_name = @sexp.meta[:arg_name]
+          scope.used_kwargs << key_name
+
+          add_temp lvar_name
+
+          line "if (!Opal.hasOwnProperty.call($kwargs.$$smap, '#{key_name}')) {"
+          line "  throw Opal.ArgumentError.$new('missing keyword: #{key_name}');"
+          line '}'
+          line "#{lvar_name} = $kwargs.$$smap[#{key_name.to_s.inspect}];"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'opal/nodes/base'
+
+module Opal
+  module Nodes
+    module Args
+      # A utility node responsible for extracting
+      # post-kwargs from post-arguments.
+      #
+      # This node is used when kwargs cannot be inlined:
+      #   def m(a = 1, kw:); end
+      #
+      # This node is NOT used when kwargs can be inlined:
+      #   def m(a, kw:); end
+      #
+      class ExtractKwargs < Base
+        handle :extract_kwargs
+
+        def compile
+          add_temp '$kwargs'
+
+          line '$kwargs = Opal.extract_kwargs($post_args)'
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'opal/nodes/base'
+
+module Opal
+  module Nodes
+    module Args
+      # This node is responsible for extracting a single
+      # optional keyword argument from $kwargs
+      #
+      # $kwargs always exist (as argument when inlining is possible
+      # and as a local variable when it's not)
+      #
+      class ExtractKwoptarg < Base
+        handle :extract_kwoptarg
+        children :lvar_name, :default_value
+
+        def compile
+          key_name = @sexp.meta[:arg_name]
+          scope.used_kwargs << key_name
+
+          add_temp lvar_name
+
+          line "#{lvar_name} = $kwargs.$$smap[#{key_name.to_s.inspect}];"
+
+          return if default_value.children[1] == :undefined
+
+          line "if (#{lvar_name} == null) {"
+          line "  #{lvar_name} = ", expr(default_value)
+          line "}"
+        end
+      end
+    end
+  end
+end