ruby-next-parser 3.0.0.1 → 3.0.0.2

data/lib/parser/rubynext.y

@@ -46,7 +46,17 @@ preclow
 
 rule
 
-         program: top_compstmt
+         program:   {
+                      @current_arg_stack.push(nil)
+                      @max_numparam_stack.push
+                    }
+                  top_compstmt
+                    {
+                      result = val[1]
+
+                      @current_arg_stack.pop
+                      @max_numparam_stack.pop
+                    }
 
     top_compstmt: top_stmts opt_terms
                     {
@@ -206,25 +216,8 @@ rule
                     {
                       result = @builder.multi_assign(val[0], val[1], val[2])
                     }
-                | rassign
                 | expr
 
-        rassign: arg_value tASSOC lhs
-                    {
-                      result = @builder.rassign(val[0], val[1], val[2])
-                    }
-                | arg_value tASSOC mlhs
-                    {
-                      result = @builder.multi_rassign(val[0], val[1], val[2])
-                    }
-                | rassign tASSOC lhs
-                    {
-                      result = @builder.rassign(val[0], val[1], val[2])
-                    }
-                | rassign tASSOC mlhs
-                    {
-                      result = @builder.multi_rassign(val[0], val[1], val[2])
-                    }
 
     command_asgn: lhs tEQL command_rhs
                     {
@@ -301,19 +294,35 @@ rule
                     {
                       result = @builder.not_op(val[0], nil, val[1], nil)
                     }
+                | arg tASSOC
+                    {
+                      @lexer.state = :expr_beg
+                      @lexer.command_start = false
+                      @pattern_variables.push
+
+                      result = @lexer.in_kwarg
+                      @lexer.in_kwarg = true
+                    }
+                  p_expr
+                    {
+                      @pattern_variables.pop
+                      @lexer.in_kwarg = val[2]
+                      result = @builder.match_pattern(val[0], val[1], val[3])
+                    }
                 | arg kIN
                     {
                       @lexer.state = :expr_beg
                       @lexer.command_start = false
-                      pattern_variables.push
+                      @pattern_variables.push
 
                       result = @lexer.in_kwarg
                       @lexer.in_kwarg = true
                     }
                   p_expr
                     {
+                      @pattern_variables.pop
                       @lexer.in_kwarg = val[2]
-                      result = @builder.in_match(val[0], val[1], val[3])
+                      result = @builder.match_pattern_p(val[0], val[1], val[3])
                     }
                 | arg =tLBRACE_ARG
 
@@ -328,7 +337,7 @@ rule
                       result = [ val[1], val[2] ]
                     }
 
-        def_name:  fname
+        def_name: fname
                     {
                       @static_env.extend_static
                       @lexer.cmdarg.push(false)
@@ -864,13 +873,10 @@ rule
                       result = @builder.ternary(val[0], val[1],
                                                 val[2], val[4], val[5])
                     }
-                | defn_head f_paren_args tEQL arg
+                | defn_head f_opt_paren_args tEQL arg
                     {
                       _def_t, name_t = val[0]
-
-                      if name_t[0].end_with?('=')
-                        diagnostic :error, :endless_setter, nil, name_t
-                      end
+                      endless_method_name(name_t)
 
                       result = @builder.def_endless_method(*val[0],
                                  val[1], val[2], val[3])
@@ -881,8 +887,11 @@ rule
                       @context.pop
                       @current_arg_stack.pop
                     }
-                | defn_head f_paren_args tEQL arg kRESCUE_MOD arg
+                | defn_head f_opt_paren_args tEQL arg kRESCUE_MOD arg
                     {
+                      _def_t, name_t = val[0]
+                      endless_method_name(name_t)
+
                       rescue_body = @builder.rescue_body(val[4],
                                         nil, nil, nil,
                                         nil, val[5])
@@ -898,8 +907,11 @@ rule
                       @context.pop
                       @current_arg_stack.pop
                     }
-                | defs_head f_paren_args tEQL arg
+                | defs_head f_opt_paren_args tEQL arg
                     {
+                      _def_t, _recv, _dot_t, name_t = val[0]
+                      endless_method_name(name_t)
+
                       result = @builder.def_endless_singleton(*val[0],
                                  val[1], val[2], val[3])
 
@@ -909,8 +921,11 @@ rule
                       @context.pop
                       @current_arg_stack.pop
                     }
-                | defs_head f_paren_args tEQL arg kRESCUE_MOD arg
+                | defs_head f_opt_paren_args tEQL arg kRESCUE_MOD arg
                     {
+                      _def_t, _recv, _dot_t, name_t = val[0]
+                      endless_method_name(name_t)
+
                       rescue_body = @builder.rescue_body(val[4],
                                         nil, nil, nil,
                                         nil, val[5])
@@ -1853,6 +1868,8 @@ opt_block_args_tail:
                     }
                   p_top_expr then
                     {
+                      @pattern_variables.pop
+                      @pattern_hash_keys.pop
                       @lexer.in_kwarg = val[1]
                     }
                   compstmt p_cases
@@ -2621,6 +2638,12 @@ keyword_variable: kNIL
                       result = nil
                     }
 
+f_opt_paren_args: f_paren_args
+                | none
+                    {
+                      result = @builder.args(nil, [], nil)
+                    }
+
    f_paren_args: tLPAREN2 f_args rparen
                     {
                       result = @builder.args(val[0], val[1], val[2])
@@ -3070,3 +3093,9 @@ require 'parser/ruby-next/parser_ext'
   def default_encoding
     Encoding::UTF_8
   end
+
+  def endless_method_name(name_t)
+    if name_t[0].end_with?('=')
+      diagnostic :error, :endless_setter, nil, name_t
+    end
+  end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-next-parser
 version: !ruby/object:Gem::Version
-  version: 3.0.0.1
+  version: 3.0.0.2
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-28 00:00:00.000000000 Z
+date: 2020-12-23 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.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.0.5
+        version: 2.7.2.0
 description: "\n    Parser extension to support edge and experimental Ruby syntax\n
   \ "
 email: