ruby-next-parser 3.0.0.1 → 3.1.0.0

data/lib/parser/rubynext.y

@@ -17,7 +17,8 @@ token kCLASS kMODULE kDEF kUNDEF kBEGIN kRESCUE kENSURE kEND kIF kUNLESS
       tWORDS_BEG tQWORDS_BEG tSYMBOLS_BEG tQSYMBOLS_BEG tSTRING_DBEG
       tSTRING_DVAR tSTRING_END tSTRING_DEND tSTRING tSYMBOL
       tNL tEH tCOLON tCOMMA tSPACE tSEMI tLAMBDA tLAMBEG tCHARACTER
-      tRATIONAL tIMAGINARY tLABEL_END tANDDOT tMETHREF tBDOT2 tBDOT3
+      tRATIONAL tIMAGINARY tLABEL_END tANDDOT tBDOT2 tBDOT3
+      tMETHREF
 
 prechigh
   right    tBANG tTILDE tUPLUS
@@ -46,7 +47,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 +217,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
                     {
@@ -268,6 +262,74 @@ rule
                                     val[0], val[1], val[2]),
                                   val[3], val[4])
                     }
+                | defn_head f_opt_paren_args tEQL command
+                    {
+                      _def_t, name_t = val[0]
+                      endless_method_name(name_t)
+
+                      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_opt_paren_args tEQL command 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])
+
+                      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
+                      @context.pop
+                      @current_arg_stack.pop
+                    }
+                | defs_head f_opt_paren_args tEQL command
+                    {
+                      _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])
+
+                      @lexer.cmdarg.pop
+                      @lexer.cond.pop
+                      @static_env.unextend
+                      @context.pop
+                      @current_arg_stack.pop
+                    }
+                | defs_head f_opt_paren_args tEQL command 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])
+
+                      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
+                      @context.pop
+                      @current_arg_stack.pop
+                    }
                 | backref tOP_ASGN command_rhs
                     {
                       @builder.op_assign(val[0], val[1], val[2])
@@ -301,19 +363,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_top_expr_body
+                    {
+                      @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
+                  p_top_expr_body
                     {
+                      @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 +406,7 @@ rule
                       result = [ val[1], val[2] ]
                     }
 
-        def_name:  fname
+        def_name: fname
                     {
                       @static_env.extend_static
                       @lexer.cmdarg.push(false)
@@ -864,13 +942,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 +956,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 +976,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 +990,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 +1937,8 @@ opt_block_args_tail:
                     }
                   p_top_expr then
                     {
+                      @pattern_variables.pop
+                      @pattern_hash_keys.pop
                       @lexer.in_kwarg = val[1]
                     }
                   compstmt p_cases
@@ -1933,6 +2019,7 @@ opt_block_args_tail:
                     }
 
     p_expr_basic: p_value
+                | p_variable
                 | p_const p_lparen p_args rparen
                     {
                       @pattern_hash_keys.pop
@@ -2178,8 +2265,8 @@ opt_block_args_tail:
                     {
                       result = @builder.range_exclusive(val[0], val[1], nil)
                     }
-                | p_variable
                 | p_var_ref
+                | p_expr_ref
                 | p_const
                 | tBDOT2 p_primitive
                     {
@@ -2206,7 +2293,7 @@ opt_block_args_tail:
 
       p_variable: tIDENTIFIER
                     {
-                      result = @builder.match_var(val[0])
+                      result = @builder.assignable(@builder.match_var(val[0]))
                     }
 
        p_var_ref: tCARET tIDENTIFIER
@@ -2220,6 +2307,18 @@ opt_block_args_tail:
                       result = @builder.pin(val[0], lvar)
                     }
 
+                | tCARET nonlocal_var
+                    {
+                      non_lvar = @builder.accessible(val[1])
+                      result = @builder.pin(val[0], non_lvar)
+                    }
+
+      p_expr_ref: tCARET tLPAREN expr_value tRPAREN
+                    {
+                      expr = @builder.begin(val[1], val[2], val[3])
+                      result = @builder.pin(val[0], expr)
+                    }
+
          p_const: tCOLON3 cname
                     {
                       result = @builder.const_global(val[0], val[1])
@@ -2491,6 +2590,19 @@ regexp_contents: # nothing
                       result = @builder.complex(val[0])
                     }
 
+    nonlocal_var: tIVAR
+                    {
+                      result = @builder.ivar(val[0])
+                    }
+                | tGVAR
+                    {
+                      result = @builder.gvar(val[0])
+                    }
+                | tCVAR
+                    {
+                      result = @builder.cvar(val[0])
+                    }
+
    user_variable: tIDENTIFIER
                     {
                       result = @builder.ident(val[0])
@@ -2543,46 +2655,6 @@ keyword_variable: kNIL
 
          var_ref: user_variable
                     {
-                      if (node = val[0]) && node.type == :ident
-                        name = node.children[0]
-
-                        if name =~ /\A_[1-9]\z/ && !static_env.declared?(name) && context.in_dynamic_block?
-                          # definitely an implicit param
-                          location = node.loc.expression
-
-                          if max_numparam_stack.has_ordinary_params?
-                            diagnostic :error, :ordinary_param_defined, nil, [nil, location]
-                          end
-
-                          raw_context = context.stack.dup
-                          raw_max_numparam_stack = max_numparam_stack.stack.dup
-
-                          # ignore current block scope
-                          raw_context.pop
-                          raw_max_numparam_stack.pop
-
-                          raw_context.reverse_each do |outer_scope|
-                            if outer_scope == :block || outer_scope == :lambda
-                              outer_scope_has_numparams = raw_max_numparam_stack.pop > 0
-
-                              if outer_scope_has_numparams
-                                diagnostic :error, :numparam_used_in_outer_scope, nil, [nil, location]
-                              else
-                                # for now it's ok, but an outer scope can also be a block
-                                # with numparams, so we need to continue
-                              end
-                            else
-                              # found an outer scope that can't have numparams
-                              # like def/class/etc
-                              break
-                            end
-                          end
-
-                          static_env.declare(name)
-                          max_numparam_stack.register(name[1].to_i)
-                        end
-                      end
-
                       result = @builder.accessible(val[0])
                     }
                 | keyword_variable
@@ -2621,6 +2693,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])
@@ -2966,24 +3044,7 @@ keyword_variable: kNIL
                     {
                       result = []
                     }
-                | assoc_items trailer
-
-    assoc_items	: assoc_item
-                    {
-                      result = [ val[0] ]
-                    }
-                | assoc_items tCOMMA assoc_item
-                    {
-                      result = val[0] << val[2]
-                    }
-
-      assoc_item: assoc
-                |
-                  tIDENTIFIER
-                    {
-                      lvar = @builder.accessible(@builder.ident(val[0]))
-                      result = @builder.ipair(lvar)
-                    }
+                | assocs trailer
 
           assocs: assoc
                     {
@@ -3002,6 +3063,10 @@ keyword_variable: kNIL
                     {
                       result = @builder.pair_keyword(val[0], val[1])
                     }
+                | tLABEL
+                    {
+                      result = @builder.pair_label(val[0])
+                    }
                 | tSTRING_BEG string_contents tLABEL_END arg_value
                     {
                       result = @builder.pair_quoted(val[0], val[1], val[2], val[3])
@@ -3064,9 +3129,59 @@ require 'parser/ruby-next/parser_ext'
   prepend Parser::NextExt
 
   def version
-    30
+    31
   end
 
   def default_encoding
     Encoding::UTF_8
   end
+
+  def endless_method_name(name_t)
+    if !%w[=== == != <= >=].include?(name_t[0]) && name_t[0].end_with?('=')
+      diagnostic :error, :endless_setter, nil, name_t
+    end
+  end
+
+  def try_declare_numparam(node)
+    name = node.children[0]
+
+    if name =~ /\A_[1-9]\z/ && !static_env.declared?(name) && context.in_dynamic_block?
+      # definitely an implicit param
+      location = node.loc.expression
+
+      if max_numparam_stack.has_ordinary_params?
+        diagnostic :error, :ordinary_param_defined, nil, [nil, location]
+      end
+
+      raw_context = context.stack.dup
+      raw_max_numparam_stack = max_numparam_stack.stack.dup
+
+      # ignore current block scope
+      raw_context.pop
+      raw_max_numparam_stack.pop
+
+      raw_context.reverse_each do |outer_scope|
+        if outer_scope == :block || outer_scope == :lambda
+          outer_scope_has_numparams = raw_max_numparam_stack.pop > 0
+
+          if outer_scope_has_numparams
+            diagnostic :error, :numparam_used_in_outer_scope, nil, [nil, location]
+          else
+            # for now it's ok, but an outer scope can also be a block
+            # with numparams, so we need to continue
+          end
+        else
+          # found an outer scope that can't have numparams
+          # like def/class/etc
+          break
+        end
+      end
+
+      static_env.declare(name)
+      max_numparam_stack.register(name[1].to_i)
+
+      true
+    else
+      false
+    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.1.0.0
 platform: ruby
 authors:
 - Vladimir Dementyev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-28 00:00:00.000000000 Z
+date: 2021-11-28 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: 3.0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.0.5
+        version: 3.0.3.0
 description: "\n    Parser extension to support edge and experimental Ruby syntax\n
   \ "
 email:
@@ -46,9 +46,9 @@ homepage: http://github.com/ruby-next/parser
 licenses:
 - MIT
 metadata:
-  homepage_uri: http://github.com/parser/ruby-next
-  source_code_uri: http://github.com/parser/ruby-next
-post_install_message: 
+  homepage_uri: http://github.com/ruby-next/parser
+  source_code_uri: http://github.com/ruby-next/parser
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -63,8 +63,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Parser extension to support edge and experimental Ruby syntax
 test_files: []