ruby-next-parser 3.1.1.2 → 3.2.2.0

data/lib/parser/rubynext.y

@@ -360,6 +360,7 @@ rule
                       @lexer.state = :expr_beg
                       @lexer.command_start = false
                       @pattern_variables.push
+                      @pattern_hash_keys.push
 
                       result = @context.in_kwarg
                       @context.in_kwarg = true
@@ -367,6 +368,7 @@ rule
                   p_top_expr_body
                     {
                       @pattern_variables.pop
+                      @pattern_hash_keys.pop
                       @context.in_kwarg = val[2]
                       result = @builder.match_pattern(val[0], val[1], val[3])
                     }
@@ -375,6 +377,7 @@ rule
                       @lexer.state = :expr_beg
                       @lexer.command_start = false
                       @pattern_variables.push
+                      @pattern_hash_keys.push
 
                       result = @context.in_kwarg
                       @context.in_kwarg = true
@@ -382,6 +385,7 @@ rule
                   p_top_expr_body
                     {
                       @pattern_variables.pop
+                      @pattern_hash_keys.pop
                       @context.in_kwarg = val[2]
                       result = @builder.match_pattern_p(val[0], val[1], val[3])
                     }
@@ -1172,6 +1176,14 @@ rule
                     {
                       result = [ @builder.splat(val[0], val[1]) ]
                     }
+                | tSTAR
+                    {
+                      if !@static_env.declared_anonymous_restarg?
+                        diagnostic :error, :no_anonymous_restarg, nil, val[0]
+                      end
+
+                      result = [ @builder.forwarded_restarg(val[0]) ]
+                    }
                 | args tCOMMA arg_value
                     {
                       result = val[0] << val[2]
@@ -1180,6 +1192,14 @@ rule
                     {
                       result = val[0] << @builder.splat(val[2], val[3])
                     }
+                | args tCOMMA tSTAR
+                    {
+                      if !@static_env.declared_anonymous_restarg?
+                        diagnostic :error, :no_anonymous_restarg, nil, val[2]
+                      end
+
+                      result = val[0] << @builder.forwarded_restarg(val[2])
+                    }
 
         mrhs_arg: mrhs
                     {
@@ -2266,11 +2286,14 @@ opt_block_args_tail:
 
       p_kwnorest: kwrest_mark kNIL
                     {
-                      result = [ @builder.match_nil_pattern(val[0], val[1]) ]
+                      result = val
                     }
 
     p_any_kwrest: p_kwrest
                 | p_kwnorest
+                    {
+                      result = [ @builder.match_nil_pattern(val[0][0], val[0][1]) ]
+                    }
 
          p_value: p_primitive
                 | p_primitive tDOT2 p_primitive
@@ -2342,7 +2365,7 @@ opt_block_args_tail:
                       result = @builder.pin(val[0], non_lvar)
                     }
 
-      p_expr_ref: tCARET tLPAREN expr_value tRPAREN
+      p_expr_ref: tCARET tLPAREN expr_value rparen
                     {
                       expr = @builder.begin(val[1], val[2], val[3])
                       result = @builder.pin(val[0], expr)
@@ -2636,22 +2659,11 @@ regexp_contents: # nothing
                     {
                       result = @builder.ident(val[0])
                     }
-                | tIVAR
-                    {
-                      result = @builder.ivar(val[0])
-                    }
-                | tGVAR
-                    {
-                      result = @builder.gvar(val[0])
-                    }
                 | tCONSTANT
                     {
                       result = @builder.const(val[0])
                     }
-                | tCVAR
-                    {
-                      result = @builder.cvar(val[0])
-                    }
+                | nonlocal_var
 
 keyword_variable: kNIL
                     {
@@ -2986,9 +2998,9 @@ f_opt_paren_args: f_paren_args
 
      kwrest_mark: tPOW | tDSTAR
 
-      f_no_kwarg: kwrest_mark kNIL
+      f_no_kwarg: p_kwnorest
                     {
-                      result = [ @builder.kwnilarg(val[0], val[1]) ]
+                      result = [ @builder.kwnilarg(val[0][0], val[0][1]) ]
                     }
 
         f_kwrest: kwrest_mark tIDENTIFIER
@@ -2999,6 +3011,8 @@ f_opt_paren_args: f_paren_args
                     }
                 | kwrest_mark
                     {
+                      @static_env.declare_anonymous_kwrestarg
+
                       result = [ @builder.kwrestarg(val[0]) ]
                     }
 
@@ -3044,6 +3058,8 @@ f_opt_paren_args: f_paren_args
                     }
                 | restarg_mark
                     {
+                      @static_env.declare_anonymous_restarg
+
                       result = [ @builder.restarg(val[0]) ]
                     }
 
@@ -3112,9 +3128,17 @@ f_opt_paren_args: f_paren_args
                     {
                       result = @builder.kwsplat(val[0], val[1])
                     }
+                | tDSTAR
+                    {
+                      if !@static_env.declared_anonymous_kwrestarg?
+                        diagnostic :error, :no_anonymous_kwrestarg, nil, val[0]
+                      end
+
+                      result = @builder.forwarded_kwrestarg(val[0])
+                    }
 
        operation: tIDENTIFIER | tCONSTANT | tFID
-      operation2: tIDENTIFIER | tCONSTANT | tFID | op
+      operation2: operation | op
       operation3: tIDENTIFIER | tFID | op
     dot_or_colon: call_op | tCOLON2
          call_op: tDOT
@@ -3139,7 +3163,7 @@ f_opt_paren_args: f_paren_args
                     {
                       result = val[1]
                     }
-         trailer:  | tNL | tCOMMA
+         trailer: opt_nl | tCOMMA
 
             term: tSEMI
                   {
@@ -3166,7 +3190,7 @@ require 'parser/ruby-next/parser_ext'
 prepend Parser::NextExt
 
   def version
-    32
+    33
   end
 
   def default_encoding

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-next-parser
 version: !ruby/object:Gem::Version
-  version: 3.1.1.2
+  version: 3.2.2.0
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-11 00:00:00.000000000 Z
+date: 2023-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -35,7 +35,8 @@ files:
 - lib/parser/ruby-next/AST_FORMAT.md
 - lib/parser/ruby-next/ast/processor.rb
 - lib/parser/ruby-next/builder.rb
-- lib/parser/ruby-next/lexer.rb
+- lib/parser/ruby-next/lexer-F0.rb
+- lib/parser/ruby-next/lexer-F1.rb
 - lib/parser/ruby-next/lexer.rl
 - lib/parser/ruby-next/meta.rb
 - lib/parser/ruby-next/parser_ext.rb
@@ -63,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Parser extension to support edge and experimental Ruby syntax