parser 3.0.3.2 → 3.1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2251af231c276f8a7afbb8c5766ec286e076737a5446f3b453915243884684a
-  data.tar.gz: 0045f0edcd07e6a0b152af2ea75146017fb0c0217584e2edc56d5eedcafe0f71
+  metadata.gz: 7ed45256e09de6d92098e12e73a655fe9d4f35518f573984bf1d92ac87ae8ded
+  data.tar.gz: 68ee7fca4f6d1794e2fb160552b01b983466cd482cad8783ba5f7b1466d0e70b
 SHA512:
-  metadata.gz: 44814126d3b6b6e960e1044a320ca2e94cec80bef3a58be0dcb10b9ed92bb2ebe4c21ab4b446e3e14c65a8c4f18bd265252462d056944ad0e15c5928bcd58ba8
-  data.tar.gz: da8145dd6a52dd3f4f9d4db73b4295d8df88dae974fac3df7db353a16ad95f45746066ddf98252ea3453660a2345d349cce8b2ca0e7f36bea2fade61cfd3368e
+  metadata.gz: 2f8f0785aba15f53c97b046aa5155ffeff4063b12fb611612bd7c3b94affb282487b5aad5ca783d2b928a91333db6e572a2a8a466fe9c7f5716354cb23644471
+  data.tar.gz: b8ecfc04463142cffb2aaad920e95e11257a1a6f7587bf439620b73e59102f15850c413dc807b613379678de9878aa2d941f3fa65ab20716f6be6d80fcf03299

data/lib/parser/builders/default.rb

@@ -714,7 +714,7 @@ module Parser
         node.updated(:gvasgn)
 
       when :const
-        unless @parser.context.dynamic_const_definition_allowed?
+        if @parser.context.in_def
           diagnostic :error, :dynamic_const, nil, node.loc.expression
         end
 

data/lib/parser/context.rb

@@ -16,60 +16,34 @@ module Parser
   # + :lambda - in the lambda body (-> {})
   #
   class Context
-    attr_reader :stack
+    FLAGS = %i[
+      in_defined
+      in_kwarg
+      in_argdef
+      in_def
+      in_class
+      in_block
+      in_lambda
+    ]
 
     def initialize
-      @stack = []
-      freeze
-    end
-
-    def push(state)
-      @stack << state
-    end
-
-    def pop
-      @stack.pop
+      reset
     end
 
     def reset
-      @stack.clear
-    end
-
-    def empty?
-      @stack.empty?
-    end
-
-    def in_class?
-      @stack.last == :class
-    end
-
-    def indirectly_in_def?
-      @stack.include?(:def) || @stack.include?(:defs)
+      @in_defined = false
+      @in_kwarg = false
+      @in_argdef = false
+      @in_def = false
+      @in_class = false
+      @in_block = false
+      @in_lambda = false
     end
 
-    def class_definition_allowed?
-      def_index = stack.rindex { |item| [:def, :defs].include?(item) }
-      sclass_index = stack.rindex(:sclass)
-
-      def_index.nil? || (!sclass_index.nil? && sclass_index > def_index)
-    end
-    alias module_definition_allowed? class_definition_allowed?
-    alias dynamic_const_definition_allowed? class_definition_allowed?
-
-    def in_block?
-      @stack.last == :block
-    end
-
-    def in_lambda?
-      @stack.last == :lambda
-    end
+    attr_accessor(*FLAGS)
 
     def in_dynamic_block?
-      in_block? || in_lambda?
-    end
-
-    def in_def_open_args?
-      @stack.last == :def_open_args
+      in_block || in_lambda
     end
   end
 end

data/lib/parser/current.rb

@@ -93,7 +93,7 @@ module Parser
     CurrentRuby = Ruby30
 
   when /^3\.1\./
-    current_version = '3.1.0-dev'
+    current_version = '3.1.0'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby31', current_version
     end
@@ -103,8 +103,8 @@ module Parser
 
   else # :nocov:
     # Keep this in sync with released Ruby.
-    warn_syntax_deviation 'parser/ruby30', '3.0.x'
-    require 'parser/ruby30'
-    CurrentRuby = Ruby30
+    warn_syntax_deviation 'parser/ruby31', '3.1.x'
+    require 'parser/ruby31'
+    CurrentRuby = Ruby31
   end
 end

data/lib/parser/lexer/explanation.rb

@@ -18,7 +18,7 @@ module Parser
     def advance
       type, (val, range) = advance_before_explanation
 
-      more = "(in-kwarg)" if @in_kwarg
+      more = "(in-kwarg)" if @context.in_kwarg
 
       puts decorate(range,
                     Color.green("#{type} #{val.inspect}"),