parser 2.7.1.4 → 3.0.0.0

data/lib/parser/macruby.rb

@@ -3759,7 +3759,7 @@ end
 # reduce 110 omitted
 
 def _reduce_111(val, _values, result)
-                      result = @builder.symbol(val[0])
+                      result = @builder.symbol_internal(val[0])
                     
     result
 end

data/lib/parser/max_numparam_stack.rb

@@ -2,23 +2,32 @@
 
 module Parser
 
+  # Holds p->max_numparam from parse.y
+  #
+  # @api private
   class MaxNumparamStack
     attr_reader :stack
 
+    ORDINARY_PARAMS = -1
+
     def initialize
       @stack = []
     end
 
+    def empty?
+      @stack.size == 0
+    end
+
     def has_ordinary_params!
-      set(-1)
+      set(ORDINARY_PARAMS)
     end
 
     def has_ordinary_params?
-      top < 0
+      top == ORDINARY_PARAMS
     end
 
     def has_numparams?
-      top > 0
+      top && top > 0
     end
 
     def register(numparam)
@@ -40,8 +49,7 @@ module Parser
     private
 
     def set(value)
-      @stack.pop
-      @stack.push(value)
+      @stack[@stack.length - 1] = value
     end
   end
 

data/lib/parser/messages.rb

@@ -35,6 +35,7 @@ module Parser
     # Lexer warnings
     :invalid_escape_use      => 'invalid character syntax; use ?%{escape}',
     :ambiguous_literal       => 'ambiguous first argument; put parentheses or a space even after the operator',
+    :ambiguous_regexp        => "ambiguity between regexp and two divisions: wrap regexp in parentheses or add a space after `/' operator",
     :ambiguous_prefix        => "`%{prefix}' interpreted as argument prefix",
     :triple_dot_at_eol       => '... at EOL, should be parenthesized',
 
@@ -65,6 +66,7 @@ module Parser
     :invalid_return               => 'Invalid return in class/module body',
     :csend_in_lhs_of_masgn        => '&. inside multiple assignment destination',
     :cant_assign_to_numparam      => 'cannot assign to numbered parameter %{name}',
+    :reserved_for_numparam        => '%{name} is reserved for numbered parameter',
     :ordinary_param_defined       => 'ordinary parameter is defined',
     :numparam_used_in_outer_scope => 'numbered parameter is already used in an outer scope',
     :circular_argument_reference  => 'circular argument reference %{var_name}',
@@ -73,6 +75,7 @@ module Parser
     :undefined_lvar               => "no such local variable: `%{name}'",
     :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',
 
     # Parser warnings
     :useless_else            => 'else without rescue is useless',

data/lib/parser/meta.rb

@@ -7,23 +7,23 @@ module Parser
     # All node types that parser can produce. Not all parser versions
     # will be able to produce every possible node.
     NODE_TYPES =
-      %w(
+      %i(
         true false nil int float str dstr
         sym dsym xstr regopt regexp array splat
         pair kwsplat hash irange erange self
         lvar ivar cvar gvar const defined? lvasgn
-        ivasgn cvasgn gvasgn casgn mlhs masgn rasgn mrasgn
+        ivasgn cvasgn gvasgn casgn mlhs masgn
         op_asgn and_asgn ensure rescue arg_expr
         or_asgn back_ref nth_ref
         match_with_lvasgn match_current_line
-        module class sclass def defs def_e defs_e undef alias args
+        module class sclass def defs undef alias args
         cbase arg optarg restarg blockarg block_pass kwarg kwoptarg
         kwrestarg kwnilarg send csend super zsuper yield block
         and not or if when case while until while_post
         until_post for break next redo return resbody
         kwbegin begin retry preexe postexe iflipflop eflipflop
         shadowarg complex rational __FILE__ __LINE__ __ENCODING__
-        ident root lambda indexasgn index procarg0
+        ident lambda indexasgn index procarg0
         restarg_expr blockarg_expr
         objc_kwarg objc_restarg objc_varargs
         numargs numblock forward_args forwarded_args forward_arg
@@ -31,8 +31,9 @@ module Parser
         match_var pin match_alt match_as match_rest
         array_pattern match_with_trailing_comma array_pattern_with_tail
         hash_pattern const_pattern if_guard unless_guard match_nil_pattern
-        empty_else find_pattern
-      ).map(&:to_sym).to_set.freeze
+        empty_else find_pattern kwargs
+        match_pattern_p match_pattern
+      ).to_set.freeze
 
   end # Meta
 end # Parser

data/lib/parser/ruby18.rb

@@ -2256,7 +2256,7 @@ racc_reduce_table = [
   5, 156, :_reduce_213,
   1, 156, :_reduce_none,
   1, 153, :_reduce_none,
-  1, 150, :_reduce_none,
+  1, 150, :_reduce_216,
   2, 150, :_reduce_217,
   2, 150, :_reduce_218,
   5, 150, :_reduce_219,
@@ -3576,7 +3576,7 @@ end
 # reduce 97 omitted
 
 def _reduce_98(val, _values, result)
-                      result = @builder.symbol(val[0])
+                      result = @builder.symbol_internal(val[0])
                     
     result
 end
@@ -4024,7 +4024,11 @@ end
 
 # reduce 215 omitted
 
-# reduce 216 omitted
+def _reduce_216(val, _values, result)
+                      result = []
+                    
+    result
+end
 
 def _reduce_217(val, _values, result)
                       result = [ val[0] ]

data/lib/parser/ruby19.rb

@@ -3756,7 +3756,7 @@ end
 # reduce 114 omitted
 
 def _reduce_115(val, _values, result)
-                      result = @builder.symbol(val[0])
+                      result = @builder.symbol_internal(val[0])
                     
     result
 end

data/lib/parser/ruby20.rb

@@ -3967,7 +3967,7 @@ end
 # reduce 116 omitted
 
 def _reduce_117(val, _values, result)
-                      result = @builder.symbol(val[0])
+                      result = @builder.symbol_internal(val[0])
                     
     result
 end

data/lib/parser/ruby21.rb

@@ -3998,7 +3998,7 @@ end
 # reduce 115 omitted
 
 def _reduce_116(val, _values, result)
-                      result = @builder.symbol(val[0])
+                      result = @builder.symbol_internal(val[0])
                     
     result
 end

data/lib/parser/ruby22.rb

@@ -4021,7 +4021,7 @@ end
 # reduce 115 omitted
 
 def _reduce_116(val, _values, result)
-                      result = @builder.symbol(val[0])
+                      result = @builder.symbol_internal(val[0])
                     
     result
 end

data/lib/parser/ruby23.rb

@@ -4024,7 +4024,7 @@ end
 # reduce 115 omitted
 
 def _reduce_116(val, _values, result)
-                      result = @builder.symbol(val[0])
+                      result = @builder.symbol_internal(val[0])
                     
     result
 end

data/lib/parser/ruby24.rb

@@ -4053,7 +4053,7 @@ end
 # reduce 117 omitted
 
 def _reduce_118(val, _values, result)
-                      result = @builder.symbol(val[0])
+                      result = @builder.symbol_internal(val[0])
                     
     result
 end

data/lib/parser/ruby25.rb

@@ -4047,7 +4047,7 @@ end
 # reduce 120 omitted
 
 def _reduce_121(val, _values, result)
-                      result = @builder.symbol(val[0])
+                      result = @builder.symbol_internal(val[0])
                     
     result
 end

data/lib/parser/ruby26.rb

@@ -4049,7 +4049,7 @@ end
 # reduce 120 omitted
 
 def _reduce_121(val, _values, result)
-                      result = @builder.symbol(val[0])
+                      result = @builder.symbol_internal(val[0])
                     
     result
 end