rubocop-ast 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8575eee0ddbed5fb9eb553bbc33346ec8dc75216403501a46a946f825e79102
-  data.tar.gz: 5762b5f73e28c3dfd687feb0308d4248d87b90488ff99c9ddeebd49dced31941
+  metadata.gz: 80da9c79ffae899ecc1eea266704e35274d85ce07d3f46a9bed2a7ac573445b9
+  data.tar.gz: af113442d1be42f61c17b369e097c6c0ad9c5c9c49cac27c70dee3c21aa39568
 SHA512:
-  metadata.gz: c7b6f9c6f1366ec8ddcb852ce8af9abdd0f945d41c17c9221ea27e9442b324912a1ff530e9faa36a4d48242e282b5786095cf714b38180e6b9fb121e97f4d703
-  data.tar.gz: e43be065343ccc65a3c776b7073c6647c4cbf406121ec8e31782ced1b2d218937597f70a35b014d9c5681cdf7e76a8045755c4133394160ab3ed710e87639972
+  metadata.gz: d4d26dca602b849000686fa68f1b543681d8e51598741a6a4bf9e69a57ca6bab21ce8ac270b8578ad473808ed985f13ce9b080ac2259ad73fd6f87110e345305
+  data.tar.gz: 72d5d9852cd5286ba8d01c7f5b46b774fdfb7bae7382aebd9cf766b8bd103f22477d3ba7d47a62c3466bc35d74eba4784e6b53725aa4332669d20a8801d46936

data/lib/rubocop/ast/node_pattern/lexer.rex

@@ -11,8 +11,10 @@
 class RuboCop::AST::NodePattern::LexerRex
 
 macros
+        CONST_NAME                /[A-Z:][a-zA-Z_:]+/
         SYMBOL_NAME               /[\w+@*\/?!<>=~|%^-]+|\[\]=?/
         IDENTIFIER                /[a-zA-Z_][a-zA-Z0-9_-]*/
+        CALL                      /(?:#{CONST_NAME}\.)?#{IDENTIFIER}[!?]?/
         REGEXP_BODY               /(?:[^\/]|\\\/)*/
         REGEXP                    /\/(#{REGEXP_BODY})(?<!\\)\/([imxo]*)/
 rules
@@ -25,12 +27,12 @@ rules
           %w"( ) { | } [ ] < > $ ! ^ ` ... + * ? ,"
         )}/o                      { emit ss.matched, &:to_sym }
         /#{REGEXP}/o              { emit_regexp }
-        /%([A-Z:][a-zA-Z_:]+)/    { emit :tPARAM_CONST }
+        /%(#{CONST_NAME})/o       { emit :tPARAM_CONST }
         /%([a-z_]+)/              { emit :tPARAM_NAMED }
         /%(\d*)/                  { emit(:tPARAM_NUMBER) { |s| s.empty? ? 1 : s.to_i } } # Map `%` to `%1`
         /_(#{IDENTIFIER})/o       { emit :tUNIFY }
         /_/o                      { emit :tWILDCARD }
-        /\#(#{IDENTIFIER}[!?]?)/o { @state = :ARG; emit :tFUNCTION_CALL, &:to_sym }
+        /\#(#{CALL})/o            { @state = :ARG; emit :tFUNCTION_CALL, &:to_sym }
         /#{IDENTIFIER}\?/o        { @state = :ARG; emit :tPREDICATE, &:to_sym }
         /#{IDENTIFIER}/o          { emit :tNODE_TYPE, &:to_sym }
   :ARG  /\(/                      { @state = nil; emit :tARG_LIST }

data/lib/rubocop/ast/node_pattern/lexer.rex.rb

@@ -24,8 +24,10 @@ class RuboCop::AST::NodePattern::LexerRex
   require 'strscan'
 
   # :stopdoc:
+  CONST_NAME  = /[A-Z:][a-zA-Z_:]+/
   SYMBOL_NAME = /[\w+@*\/?!<>=~|%^-]+|\[\]=?/
   IDENTIFIER  = /[a-zA-Z_][a-zA-Z0-9_-]*/
+  CALL        = /(?:#{CONST_NAME}\.)?#{IDENTIFIER}[!?]?/
   REGEXP_BODY = /(?:[^\/]|\\\/)*/
   REGEXP      = /\/(#{REGEXP_BODY})(?<!\\)\/([imxo]*)/
   # :startdoc:
@@ -132,7 +134,7 @@ class RuboCop::AST::NodePattern::LexerRex
             action { emit ss.matched, &:to_sym }
           when ss.skip(/#{REGEXP}/o) then
             action { emit_regexp }
-          when ss.skip(/%([A-Z:][a-zA-Z_:]+)/) then
+          when ss.skip(/%(#{CONST_NAME})/o) then
             action { emit :tPARAM_CONST }
           when ss.skip(/%([a-z_]+)/) then
             action { emit :tPARAM_NAMED }
@@ -142,7 +144,7 @@ class RuboCop::AST::NodePattern::LexerRex
             action { emit :tUNIFY }
           when ss.skip(/_/o) then
             action { emit :tWILDCARD }
-          when ss.skip(/\#(#{IDENTIFIER}[!?]?)/o) then
+          when ss.skip(/\#(#{CALL})/o) then
             action { @state = :ARG; emit :tFUNCTION_CALL, &:to_sym }
           when ss.skip(/#{IDENTIFIER}\?/o) then
             action { @state = :ARG; emit :tPREDICATE, &:to_sym }

data/lib/rubocop/ast/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   module AST
     module Version
-      STRING = '1.0.1'
+      STRING = '1.1.0'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-ast
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-23 00:00:00.000000000 Z
+date: 2020-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser