ruby-next-parser 3.0.1.0 → 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
@@ -371,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]
@@ -386,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]
@@ -2292,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
@@ -2305,11 +2306,19 @@ opt_block_args_tail:
                       lvar = @builder.accessible(@builder.ident(val[1]))
                       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])
@@ -2581,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])
@@ -2633,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
@@ -3062,24 +3044,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
                     {
@@ -3100,8 +3065,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
                     {
@@ -3177,3 +3141,47 @@ require 'parser/ruby-next/parser_ext'
       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.1.0
+  version: 3.1.0.0
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-04 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.2.0
+        version: 3.0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.2.0
+        version: 3.0.3.0
 description: "\n    Parser extension to support edge and experimental Ruby syntax\n
   \ "
 email:
@@ -63,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Parser extension to support edge and experimental Ruby syntax