parser 3.2.2.2 → 3.2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7abfac0733b7b27d6cdcdbc658b435ab670f967b8a0f833b556adca39c20576b
-  data.tar.gz: 7502da81ba926599b739b43bba1d946407b616a5b18f27ca17e205fdaaafa8b7
+  metadata.gz: 8565383a05692fe05c5f0962a0cb6c4594ad1eaab98f8e1c8b1053ddfa665858
+  data.tar.gz: 280636e65eab161acc6369cdf992faa4f81a6496ebbbad794a96ee60ea3e4884
 SHA512:
-  metadata.gz: 849349f3b5eddff404a8af55918e1cafc8737743cb83fe45f69b2353e5be9dc95f9f064bce8d4fba80e1a2d31712060c6abfec5a5eea622bf48aae80d96967f6
-  data.tar.gz: 28d98f09acbaffb2c26dab8c35ed806f1d510ea1bee9e9d14adc71d6797e190f950fee817339fc4aa1b9ae61704cd30a923f837fd1438cda8804b4a5970c0f86
+  metadata.gz: 8721d3c59c29a9bcb9562b6f0bad1ca119f854873fb3b6f5e550553a6d2fa471afb2d3e1c6c5b1323d5121b36f4070ed0a3bca24866b3dede1682658bbce934f
+  data.tar.gz: e312e821428e6c15ec871971aabee38cd7c238adfc855ff1a4b70edb31f529e359162c1961141d2ce3fe0d5f6aee3fce009c6a479aaa3909920993af58d3c3f2

data/lib/parser/builders/default.rb

@@ -1690,24 +1690,34 @@ module Parser
           cond
         end
 
-      when :and, :or, :irange, :erange
+      when :and, :or
         lhs, rhs = *cond
 
-        type = case cond.type
-        when :irange then :iflipflop
-        when :erange then :eflipflop
-        end
-
-        if [:and, :or].include?(cond.type) &&
-               @parser.version == 18
+        if @parser.version == 18
           cond
         else
-          cond.updated(type, [
+          cond.updated(cond.type, [
             check_condition(lhs),
             check_condition(rhs)
           ])
         end
 
+      when :irange, :erange
+        lhs, rhs = *cond
+
+        type = case cond.type
+        when :irange then :iflipflop
+        when :erange then :eflipflop
+        end
+
+        lhs_condition = check_condition(lhs) unless lhs.nil?
+        rhs_condition = check_condition(rhs) unless rhs.nil?
+
+        return cond.updated(type, [
+          lhs_condition,
+          rhs_condition
+        ])
+
       when :regexp
         n(:match_current_line, [ cond ], expr_map(cond.loc.expression))
 

data/lib/parser/macruby.rb

@@ -1,7 +1,7 @@
 # -*- encoding:utf-8; warn-indent:false; frozen_string_literal: true  -*-
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.7.0
+# This file is automatically generated by Racc 1.7.1
 # from Racc grammar file "".
 #
 

data/lib/parser/ruby18.rb

@@ -1,7 +1,7 @@
 # -*- encoding:utf-8; warn-indent:false; frozen_string_literal: true  -*-
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.7.0
+# This file is automatically generated by Racc 1.7.1
 # from Racc grammar file "".
 #
 

data/lib/parser/ruby19.rb

@@ -1,7 +1,7 @@
 # -*- encoding:utf-8; warn-indent:false; frozen_string_literal: true  -*-
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.7.0
+# This file is automatically generated by Racc 1.7.1
 # from Racc grammar file "".
 #
 

data/lib/parser/ruby20.rb

@@ -1,7 +1,7 @@
 # -*- encoding:utf-8; warn-indent:false; frozen_string_literal: true  -*-
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.7.0
+# This file is automatically generated by Racc 1.7.1
 # from Racc grammar file "".
 #
 

data/lib/parser/ruby21.rb

@@ -1,7 +1,7 @@
 # -*- encoding:utf-8; warn-indent:false; frozen_string_literal: true  -*-
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.7.0
+# This file is automatically generated by Racc 1.7.1
 # from Racc grammar file "".
 #
 

data/lib/parser/ruby22.rb

@@ -1,7 +1,7 @@
 # -*- encoding:utf-8; warn-indent:false; frozen_string_literal: true  -*-
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.7.0
+# This file is automatically generated by Racc 1.7.1
 # from Racc grammar file "".
 #
 

data/lib/parser/ruby23.rb

@@ -1,7 +1,7 @@
 # -*- encoding:utf-8; warn-indent:false; frozen_string_literal: true  -*-
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.7.0
+# This file is automatically generated by Racc 1.7.1
 # from Racc grammar file "".
 #
 

data/lib/parser/ruby24.rb

@@ -1,7 +1,7 @@
 # -*- encoding:utf-8; warn-indent:false; frozen_string_literal: true  -*-
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.7.0
+# This file is automatically generated by Racc 1.7.1
 # from Racc grammar file "".
 #
 

data/lib/parser/ruby25.rb

@@ -1,7 +1,7 @@
 # -*- encoding:utf-8; warn-indent:false; frozen_string_literal: true  -*-
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.7.0
+# This file is automatically generated by Racc 1.7.1
 # from Racc grammar file "".
 #
 

data/lib/parser/ruby26.rb

@@ -1,7 +1,7 @@
 # -*- encoding:utf-8; warn-indent:false; frozen_string_literal: true  -*-
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.7.0
+# This file is automatically generated by Racc 1.7.1
 # from Racc grammar file "".
 #
 

data/lib/parser/ruby27.rb

@@ -1,7 +1,7 @@
 # -*- encoding:utf-8; warn-indent:false; frozen_string_literal: true  -*-
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.7.0
+# This file is automatically generated by Racc 1.7.1
 # from Racc grammar file "".
 #
 

data/lib/parser/ruby30.rb

@@ -1,7 +1,7 @@
 # -*- encoding:utf-8; warn-indent:false; frozen_string_literal: true  -*-
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.7.0
+# This file is automatically generated by Racc 1.7.1
 # from Racc grammar file "".
 #
 

data/lib/parser/ruby31.rb

@@ -1,7 +1,7 @@
 # -*- encoding:utf-8; warn-indent:false; frozen_string_literal: true  -*-
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.7.0
+# This file is automatically generated by Racc 1.7.1
 # from Racc grammar file "".
 #
 

data/lib/parser/ruby32.rb

@@ -1,7 +1,7 @@
 # -*- encoding:utf-8; warn-indent:false; frozen_string_literal: true  -*-
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.7.0
+# This file is automatically generated by Racc 1.7.1
 # from Racc grammar file "".
 #
 

data/lib/parser/ruby33.rb

@@ -1,7 +1,7 @@
 # -*- encoding:utf-8; warn-indent:false; frozen_string_literal: true  -*-
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.7.0
+# This file is automatically generated by Racc 1.7.1
 # from Racc grammar file "".
 #
 

data/lib/parser/rubymotion.rb

@@ -1,7 +1,7 @@
 # -*- encoding:utf-8; warn-indent:false; frozen_string_literal: true  -*-
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.7.0
+# This file is automatically generated by Racc 1.7.1
 # from Racc grammar file "".
 #
 

data/lib/parser/source/comment/associator.rb

@@ -95,10 +95,11 @@ module Parser
       end
 
       ##
-      # Same as {associate}, but compares by identity, thus producing an unambiguous
-      # result even in presence of equal nodes.
+      # Same as {associate}, but uses `node.loc` instead of `node` as
+      # the hash key, thus producing an unambiguous result even in presence
+      # of equal nodes.
       #
-      # @return [Hash<Parser::Source::Node, Array<Parser::Source::Comment>>]
+      # @return [Hash<Parser::Source::Map, Array<Parser::Source::Comment>>]
       #
       def associate_locations
         @map_using = :location
@@ -106,11 +107,10 @@ module Parser
       end
 
       ##
-      # Same as {associate}, but uses `node.loc` instead of `node` as
-      # the hash key, thus producing an unambiguous result even in presence
-      # of equal nodes.
+      # Same as {associate}, but compares by identity, thus producing an unambiguous
+      # result even in presence of equal nodes.
       #
-      # @return [Hash<Parser::Source::Map, Array<Parser::Source::Comment>>]
+      # @return [Hash<Parser::Source::Node, Array<Parser::Source::Comment>>]
       #
       def associate_by_identity
         @map_using = :identity

data/lib/parser/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Parser
-  VERSION = '3.2.2.2'
+  VERSION = '3.2.2.4'
 end

data/parser.gemspec

@@ -27,10 +27,10 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.0.0'
 
   spec.add_dependency             'ast',       '~> 2.4.1'
+  spec.add_dependency             'racc'
 
   spec.add_development_dependency 'bundler',   '>= 1.15', '< 3.0.0'
   spec.add_development_dependency 'rake',      '~> 13.0.1'
-  spec.add_development_dependency 'racc',      '= 1.7.0'
   spec.add_development_dependency 'cliver',    '~> 0.3.2'
 
   spec.add_development_dependency 'yard'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 3.2.2.2
+  version: 3.2.2.4
 platform: ruby
 authors:
 - whitequark
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-08 00:00:00.000000000 Z
+date: 2023-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.1
+- !ruby/object:Gem::Dependency
+  name: racc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -58,20 +72,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 13.0.1
-- !ruby/object:Gem::Dependency
-  name: racc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.7.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: cliver
   requirement: !ruby/object:Gem::Requirement
@@ -249,9 +249,9 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/whitequark/parser/issues
-  changelog_uri: https://github.com/whitequark/parser/blob/v3.2.2.2/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/parser/3.2.2.2
-  source_code_uri: https://github.com/whitequark/parser/tree/v3.2.2.2
+  changelog_uri: https://github.com/whitequark/parser/blob/v3.2.2.4/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/parser/3.2.2.4
+  source_code_uri: https://github.com/whitequark/parser/tree/v3.2.2.4
 post_install_message:
 rdoc_options: []
 require_paths: