ruby-next-parser 3.0.0.3 → 3.1.1.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
@@ -261,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])
@@ -303,7 +372,7 @@ rule
                       result = @lexer.in_kwarg
                       @lexer.in_kwarg = true
                     }
-                  p_expr
+                  p_top_expr_body
                     {
                       @pattern_variables.pop
                       @lexer.in_kwarg = val[2]
@@ -318,7 +387,7 @@ rule
                       result = @lexer.in_kwarg
                       @lexer.in_kwarg = true
                     }
-                  p_expr
+                  p_top_expr_body
                     {
                       @pattern_variables.pop
                       @lexer.in_kwarg = val[2]
@@ -1091,6 +1160,14 @@ rule
                     {
                       result = @builder.block_pass(val[0], val[1])
                     }
+                | tAMPER
+                    {
+                      if !@static_env.declared_anonymous_blockarg?
+                        diagnostic :error, :no_anonymous_blockarg, nil, val[0]
+                      end
+
+                      result = @builder.block_pass(val[0], nil)
+                    }
 
    opt_block_arg: tCOMMA block_arg
                     {
@@ -1950,6 +2027,7 @@ opt_block_args_tail:
                     }
 
     p_expr_basic: p_value
+                | p_variable
                 | p_const p_lparen p_args rparen
                     {
                       @pattern_hash_keys.pop
@@ -2046,23 +2124,13 @@ opt_block_args_tail:
                     {
                       result = [ *val[0], val[1] ]
                     }
-                | p_args_head tSTAR tIDENTIFIER
-                    {
-                      match_rest = @builder.match_rest(val[1], val[2])
-                      result = [ *val[0], match_rest ]
-                    }
-                | p_args_head tSTAR tIDENTIFIER tCOMMA p_args_post
+                | p_args_head p_rest
                     {
-                      match_rest = @builder.match_rest(val[1], val[2])
-                      result = [ *val[0], match_rest, *val[4] ]
-                    }
-                | p_args_head tSTAR
-                    {
-                      result = [ *val[0], @builder.match_rest(val[1]) ]
+                      result = [ *val[0], val[1] ]
                     }
-                | p_args_head tSTAR tCOMMA p_args_post
+                | p_args_head p_rest tCOMMA p_args_post
                     {
-                      result = [ *val[0], @builder.match_rest(val[1]), *val[3] ]
+                      result = [ *val[0], val[1], *val[3] ]
                     }
                 | p_args_tail
 
@@ -2101,6 +2169,11 @@ opt_block_args_tail:
                     {
                       result = @builder.match_rest(val[0], val[1])
                     }
+                | tSTAR nonlocal_var
+                    {
+                      non_lvar = @builder.accessible(val[1])
+                      result = @builder.match_rest(val[0], non_lvar)
+                    }
                 | tSTAR
                     {
                       result = @builder.match_rest(val[0])
@@ -2195,8 +2268,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
                     {
@@ -2223,7 +2296,12 @@ opt_block_args_tail:
 
       p_variable: tIDENTIFIER
                     {
-                      result = @builder.match_var(val[0])
+                      result = @builder.assignable(@builder.match_var(val[0]))
+                    }
+                | nonlocal_var
+                    {
+                      non_lvar = @builder.accessible(val[0])
+                      result = @builder.assignable(@builder.match_var(non_lvar))
                     }
 
        p_var_ref: tCARET tIDENTIFIER
@@ -2237,6 +2315,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])
@@ -2508,6 +2598,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])
@@ -2560,46 +2663,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
@@ -2648,20 +2711,6 @@ f_opt_paren_args: f_paren_args
                     {
                       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_only_args(val[0], val[1], val[2])
-                      @static_env.declare_forward_args
-
                       @lexer.state = :expr_value
                     }
 
@@ -2669,9 +2718,11 @@ f_opt_paren_args: f_paren_args
                 |   {
                       result = @lexer.in_kwarg
                       @lexer.in_kwarg = true
+                      @context.push(:def_open_args)
                     }
                   f_args term
                     {
+                      @context.pop
                       @lexer.in_kwarg = val[0]
                       result = @builder.args(nil, val[1], nil)
                     }
@@ -2692,6 +2743,11 @@ f_opt_paren_args: f_paren_args
                     {
                       result = [ val[0] ]
                     }
+                | args_forward
+                    {
+                      @static_env.declare_forward_args
+                      result = [ @builder.forward_arg(val[0]) ]
+                    }
 
    opt_args_tail: tCOMMA args_tail
                     {
@@ -2969,6 +3025,12 @@ f_opt_paren_args: f_paren_args
 
                       result = @builder.blockarg(val[0], val[1])
                     }
+                | blkarg_mark
+                    {
+                      @static_env.declare_anonymous_blockarg
+
+                      result = @builder.blockarg(val[0], nil)
+                    }
 
  opt_f_block_arg: tCOMMA f_block_arg
                     {
@@ -2989,24 +3051,7 @@ f_opt_paren_args: f_paren_args
                     {
                       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
                     {
@@ -3027,8 +3072,7 @@ f_opt_paren_args: f_paren_args
                     }
                 | tLABEL
                     {
-                      lvar = @builder.accessible(@builder.ident(val[0]))
-                      result = @builder.ipair_keyword(lvar)
+                      result = @builder.pair_label(val[0])
                     }
                 | tSTRING_BEG string_contents tLABEL_END arg_value
                     {
@@ -3092,7 +3136,7 @@ require 'parser/ruby-next/parser_ext'
   prepend Parser::NextExt
 
   def version
-    30
+    31
   end
 
   def default_encoding
@@ -3100,7 +3144,51 @@ require 'parser/ruby-next/parser_ext'
   end
 
   def endless_method_name(name_t)
-    if name_t[0].end_with?('=')
+    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.3
+  version: 3.1.1.0
 platform: ruby
 authors:
 - Vladimir Dementyev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-24 00:00:00.000000000 Z
+date: 2021-12-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.2.0
+        version: 3.0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.2.0
+        version: 3.0.3.1
 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: []