parser 3.0.2.0 → 3.0.3.0

data/lib/parser/messages.rb

@@ -76,9 +76,11 @@ module Parser
     :duplicate_variable_name      => 'duplicate variable name %{name}',
     :duplicate_pattern_key        => 'duplicate hash pattern key %{name}',
     :endless_setter               => 'setter method cannot be defined in an endless method definition',
+    :invalid_id_to_get            => 'identifier %{identifier} is not valid to get',
 
     # Parser warnings
     :useless_else            => 'else without rescue is useless',
+    :duplicate_hash_key      => 'key is duplicated and overwritten',
 
     # Parser errors that are not Ruby errors
     :invalid_encoding        => 'literal contains escape sequences incompatible with UTF-8',

data/lib/parser/ruby27.rb

@@ -21,6 +21,50 @@ module Parser
   def default_encoding
     Encoding::UTF_8
   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
 ##### State transition tables begin ###
 
 clist = [
@@ -6739,7 +6783,7 @@ def _reduce_522(val, _values, result)
 end
 
 def _reduce_523(val, _values, result)
-                      result = @builder.match_var(val[0])
+                      result = @builder.assignable(@builder.match_var(val[0]))
                     
     result
 end
@@ -7181,46 +7225,6 @@ def _reduce_596(val, _values, result)
 end
 
 def _reduce_597(val, _values, result)
-                      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])
                     
     result

data/lib/parser/ruby30.rb

@@ -27,6 +27,50 @@ module Parser
       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
 ##### State transition tables begin ###
 
 clist = [
@@ -6932,7 +6976,7 @@ end
 # reduce 533 omitted
 
 def _reduce_534(val, _values, result)
-                      result = @builder.match_var(val[0])
+                      result = @builder.assignable(@builder.match_var(val[0]))
                     
     result
 end
@@ -7374,46 +7418,6 @@ def _reduce_607(val, _values, result)
 end
 
 def _reduce_608(val, _values, result)
-                      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])
                     
     result