ruby-next-parser 2.8.0.4 → 2.8.0.9

data/lib/parser/rubynext.y

@@ -647,7 +647,7 @@ rule
 
            fitem: fname
                     {
-                      result = @builder.symbol(val[0])
+                      result = @builder.symbol_internal(val[0])
                     }
                 | symbol
 
@@ -869,6 +869,23 @@ rule
                       result = @builder.def_endless_method(*val[0],
                                  val[1], val[2], val[3])
 
+                      @lexer.cmdarg.pop
+                      @lexer.cond.pop
+                      @static_env.unextend
+                      @context.pop
+                      @current_arg_stack.pop
+                    }
+                | defn_head f_paren_args tEQL arg kRESCUE_MOD arg
+                    {
+                      rescue_body = @builder.rescue_body(val[4],
+                                        nil, nil, nil,
+                                        nil, val[5])
+
+                      method_body = @builder.begin_body(val[3], [ rescue_body ])
+
+                      result = @builder.def_endless_method(*val[0],
+                                 val[1], val[2], method_body)
+
                       @lexer.cmdarg.pop
                       @lexer.cond.pop
                       @static_env.unextend
@@ -880,6 +897,23 @@ rule
                       result = @builder.def_endless_singleton(*val[0],
                                  val[1], val[2], val[3])
 
+                      @lexer.cmdarg.pop
+                      @lexer.cond.pop
+                      @static_env.unextend
+                      @context.pop
+                      @current_arg_stack.pop
+                    }
+                | defs_head f_paren_args tEQL arg kRESCUE_MOD arg
+                    {
+                      rescue_body = @builder.rescue_body(val[4],
+                                        nil, nil, nil,
+                                        nil, val[5])
+
+                      method_body = @builder.begin_body(val[3], [ rescue_body ])
+
+                      result = @builder.def_endless_singleton(*val[0],
+                                 val[1], val[2], method_body)
+
                       @lexer.cmdarg.pop
                       @lexer.cond.pop
                       @static_env.unextend
@@ -926,6 +960,14 @@ rule
                     {
                       result = val
                     }
+                | tLPAREN2 args tCOMMA args_forward rparen
+                    {
+                      unless @static_env.declared_forward_args?
+                        diagnostic :error, :unexpected_token, { :token => 'tBDOT3' } , val[3]
+                      end
+
+                      result = [val[0], [*val[1], @builder.forwarded_args(val[3])], val[4]]
+                    }
                 | tLPAREN2 args_forward rparen
                     {
                       unless @static_env.declared_forward_args?
@@ -1178,14 +1220,7 @@ rule
                       result      = @builder.block(val[0],
                                       begin_t, args, body, end_t)
                     }
-                | tLAMBDA lambda
-                    {
-                      lambda_call = @builder.call_lambda(val[0])
-
-                      args, (begin_t, body, end_t) = val[1]
-                      result      = @builder.block(lambda_call,
-                                      begin_t, args, body, end_t)
-                    }
+                | lambda
                 | kIF expr_value then compstmt if_tail kEND
                     {
                       else_t, else_ = val[4]
@@ -1280,6 +1315,7 @@ rule
                     {
                       @static_env.extend_static
                       @lexer.cmdarg.push(false)
+                      @context.push(:module)
                     }
                     bodystmt kEND
                     {
@@ -1292,6 +1328,7 @@ rule
 
                       @lexer.cmdarg.pop
                       @static_env.unextend
+                      @context.pop
                     }
                 | defn_head f_arglist bodystmt kEND
                     {
@@ -1423,6 +1460,9 @@ rule
                       result = @builder.restarg(val[0])
                     }
 
+    f_any_kwrest: f_kwrest
+                | f_no_kwarg
+
  block_args_tail: f_block_kwarg tCOMMA f_kwrest opt_f_block_arg
                     {
                       result = val[0].concat(val[2]).concat(val[3])
@@ -1431,11 +1471,7 @@ rule
                     {
                       result = val[0].concat(val[1])
                     }
-                | f_kwrest opt_f_block_arg
-                    {
-                      result = val[0].concat(val[1])
-                    }
-                | f_no_kwarg opt_f_block_arg
+                | f_any_kwrest opt_f_block_arg
                     {
                       result = val[0].concat(val[1])
                     }
@@ -1454,6 +1490,8 @@ opt_block_args_tail:
                       result = []
                     }
 
+  excessed_comma: tCOMMA
+
      block_param: f_arg tCOMMA f_block_optarg tCOMMA f_rest_arg              opt_block_args_tail
                     {
                       result = val[0].
@@ -1488,7 +1526,7 @@ opt_block_args_tail:
                                   concat(val[2]).
                                   concat(val[3])
                     }
-                | f_arg tCOMMA
+                | f_arg excessed_comma
                 | f_arg tCOMMA                       f_rest_arg tCOMMA f_arg opt_block_args_tail
                     {
                       result = val[0].
@@ -1588,7 +1626,8 @@ opt_block_args_tail:
                     }
                 | f_bad_arg
 
-          lambda:   {
+          lambda: tLAMBDA
+                    {
                       @static_env.extend_dynamic
                       @max_numparam_stack.push
                       @context.push(:lambda)
@@ -1600,12 +1639,16 @@ opt_block_args_tail:
                     }
                   lambda_body
                     {
-                      args = @max_numparam_stack.has_numparams? ? @builder.numargs(@max_numparam_stack.top) : val[1]
-                      result = [ args, val[3] ]
+                      lambda_call = @builder.call_lambda(val[0])
+                      args = @max_numparam_stack.has_numparams? ? @builder.numargs(@max_numparam_stack.top) : val[2]
+                      begin_t, body, end_t = val[4]
 
                       @max_numparam_stack.pop
                       @static_env.unextend
                       @lexer.cmdarg.pop
+
+                      result      = @builder.block(lambda_call,
+                                      begin_t, args, body, end_t)
                     }
 
      f_larglist: tLPAREN2 f_args opt_bv_decl tRPAREN
@@ -1844,6 +1887,10 @@ opt_block_args_tail:
                     {
                       result = @builder.array_pattern(nil, [val[0]].concat(val[2]), nil)
                     }
+                | p_find
+                    {
+                      result = @builder.find_pattern(nil, val[0], nil)
+                    }
                 | p_args_tail
                     {
                       result = @builder.array_pattern(nil, val[0], nil)
@@ -1886,6 +1933,12 @@ opt_block_args_tail:
                       pattern = @builder.array_pattern(nil, val[2], nil)
                       result = @builder.const_pattern(val[0], val[1], pattern, val[3])
                     }
+                | p_const p_lparen p_find rparen
+                    {
+                      @pattern_hash_keys.pop
+                      pattern = @builder.find_pattern(nil, val[2], nil)
+                      result = @builder.const_pattern(val[0], val[1], pattern, val[3])
+                    }
                 | p_const p_lparen p_kwargs rparen
                     {
                       @pattern_hash_keys.pop
@@ -1903,6 +1956,12 @@ opt_block_args_tail:
                       pattern = @builder.array_pattern(nil, val[2], nil)
                       result = @builder.const_pattern(val[0], val[1], pattern, val[3])
                     }
+                | p_const p_lbracket p_find rbracket
+                    {
+                      @pattern_hash_keys.pop
+                      pattern = @builder.find_pattern(nil, val[2], nil)
+                      result = @builder.const_pattern(val[0], val[1], pattern, val[3])
+                    }
                 | p_const p_lbracket p_kwargs rbracket
                     {
                       @pattern_hash_keys.pop
@@ -1914,14 +1973,13 @@ opt_block_args_tail:
                       pattern = @builder.array_pattern(val[1], nil, val[2])
                       result = @builder.const_pattern(val[0], val[1], pattern, val[2])
                     }
-                | tLBRACK
+                | tLBRACK p_args rbracket
                     {
-                      @pattern_hash_keys.push
+                      result = @builder.array_pattern(val[0], val[1], val[2])
                     }
-                  p_args rbracket
+                | tLBRACK p_find rbracket
                     {
-                      @pattern_hash_keys.pop
-                      result = @builder.array_pattern(val[0], val[2], val[3])
+                      result = @builder.find_pattern(val[0], val[1], val[2])
                     }
                 | tLBRACK rbracket
                     {
@@ -2002,25 +2060,27 @@ opt_block_args_tail:
                       result = [ *val[0], last_item ]
                     }
 
-     p_args_tail: tSTAR tIDENTIFIER
+     p_args_tail: p_rest
                     {
-                      match_rest = @builder.match_rest(val[0], val[1])
-                      result = [ match_rest ]
+                      result = [ val[0] ]
                     }
-                | tSTAR tIDENTIFIER tCOMMA p_args_post
+                | p_rest tCOMMA p_args_post
                     {
-                      match_rest = @builder.match_rest(val[0], val[1])
-                      result = [ match_rest, *val[3] ]
+                      result = [ val[0], *val[2] ]
                     }
-                | tSTAR
+
+          p_find: p_rest tCOMMA p_args_post tCOMMA p_rest
+                    {
+                      result = [ val[0], *val[2], val[4] ]
+                    }
+
+          p_rest: tSTAR tIDENTIFIER
                     {
-                      match_rest = @builder.match_rest(val[0])
-                      result = [ match_rest ]
+                      result = @builder.match_rest(val[0], val[1])
                     }
-                | tSTAR tCOMMA p_args_post
+                | tSTAR
                     {
-                      match_rest = @builder.match_rest(val[0])
-                      result = [ match_rest, *val[2] ]
+                      result = @builder.match_rest(val[0])
                     }
 
      p_args_post: p_arg
@@ -2034,7 +2094,7 @@ opt_block_args_tail:
 
            p_arg: p_expr
 
-        p_kwargs: p_kwarg tCOMMA p_kwrest
+        p_kwargs: p_kwarg tCOMMA p_any_kwrest
                     {
                       result = [ *val[0], *val[2] ]
                     }
@@ -2046,18 +2106,10 @@ opt_block_args_tail:
                     {
                       result = val[0]
                     }
-                | p_kwrest
+                | p_any_kwrest
                     {
                       result = val[0]
                     }
-                | p_kwarg tCOMMA p_kwnorest
-                    {
-                      result = [ *val[0], *val[2] ]
-                    }
-                | p_kwnorest
-                    {
-                      result = [ *val[0], *val[2] ]
-                    }
 
          p_kwarg: p_kw
                     {
@@ -2079,7 +2131,6 @@ opt_block_args_tail:
 
       p_kw_label: tLABEL
                   {
-                    check_kwarg_name(val[0])
                     result = [:label, val[0]]
                   }
                 | tSTRING_BEG string_contents tLABEL_END
@@ -2101,6 +2152,9 @@ opt_block_args_tail:
                       result = [ @builder.match_nil_pattern(val[0], val[1]) ]
                     }
 
+    p_any_kwrest: p_kwrest
+                | p_kwnorest
+
          p_value: p_primitive
                 | p_primitive tDOT2 p_primitive
                     {
@@ -2142,14 +2196,7 @@ opt_block_args_tail:
                     {
                       result = @builder.accessible(val[0])
                     }
-                | tLAMBDA lambda
-                    {
-                      lambda_call = @builder.call_lambda(val[0])
-
-                      args, (begin_t, body, end_t) = val[1]
-                      result      = @builder.block(lambda_call,
-                                      begin_t, args, body, end_t)
-                    }
+                | lambda
 
       p_variable: tIDENTIFIER
                     {
@@ -2568,15 +2615,22 @@ keyword_variable: kNIL
                       result = nil
                     }
 
-    f_paren_args: tLPAREN2 f_args rparen
+   f_paren_args: tLPAREN2 f_args rparen
                     {
                       result = @builder.args(val[0], val[1], val[2])
 
                       @lexer.state = :expr_value
                     }
+                | tLPAREN2 f_arg tCOMMA args_forward rparen
+                    {
+                      args = [ *val[1], @builder.forward_arg(val[3]) ]
+                      result = @builder.args(val[0], args, val[4])
+
+                      @static_env.declare_forward_args
+                    }
                 | tLPAREN2 args_forward rparen
                     {
-                      result = @builder.forward_args(val[0], val[1], val[2])
+                      result = @builder.forward_only_args(val[0], val[1], val[2])
                       @static_env.declare_forward_args
 
                       @lexer.state = :expr_value
@@ -2601,11 +2655,7 @@ keyword_variable: kNIL
                     {
                       result = val[0].concat(val[1])
                     }
-                | f_kwrest opt_f_block_arg
-                    {
-                      result = val[0].concat(val[1])
-                    }
-                | f_no_kwarg opt_f_block_arg
+                | f_any_kwrest opt_f_block_arg
                     {
                       result = val[0].concat(val[1])
                     }
@@ -2991,7 +3041,7 @@ require 'parser/ruby-next/parser_ext'
   prepend Parser::NextExt
 
   def version
-    28 # the master Ruby version
+    28
   end
 
   def default_encoding

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-next-parser
 version: !ruby/object:Gem::Version
-  version: 2.8.0.4
+  version: 2.8.0.9
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-01 00:00:00.000000000 Z
+date: 2020-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.0.5
+        version: 2.7.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.0.5
+        version: 2.7.1.4
 description: "\n    Parser extension to support edge and experimental Ruby syntax\n
   \ "
 email:
@@ -39,7 +39,6 @@ files:
 - lib/parser/ruby-next/lexer.rl
 - lib/parser/ruby-next/meta.rb
 - lib/parser/ruby-next/parser_ext.rb
-- lib/parser/ruby-next/source/map/endless_definition.rb
 - lib/parser/ruby-next/version.rb
 - lib/parser/rubynext.rb
 - lib/parser/rubynext.y
@@ -57,7 +56,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/parser/ruby-next/source/map/endless_definition.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module Parser
-  module Source
-
-    class Map::EndlessDefinition < Map
-      attr_reader :keyword
-      attr_reader :operator
-      attr_reader :name
-      attr_reader :assignment
-
-      def initialize(keyword_l, operator_l, name_l, assignment_l, body_l)
-        @keyword  = keyword_l
-        @operator = operator_l
-        @name     = name_l
-        @assignment = assignment_l
-
-        super(@keyword.join(body_l))
-      end
-    end
-
-  end
-end