rubocop-ast 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d42f2a7ab5fe1a168c8307ffad746e21eaa3811cdb5f9236ce423f2fb829b9ae
-  data.tar.gz: 74ca8b1fbbbb9f0a89ae61136235f9066579da11b4a056c0161a7a7a34092e19
+  metadata.gz: 0f538f2ba2d235b12111dfc20f5cb568ed1212310bf90f3f9abf783866153b93
+  data.tar.gz: 9a67f643a7b4371f6592a846664933cd56399689a3c8005ef4ef8ddfb4857341
 SHA512:
-  metadata.gz: ffeca2200e1825749aa09f72e90b98b643617b55f4300ad9de8f34bedb59534278ebd4490d50d6e6866b055a5b5d9e28707e69c221c8da16e6c6691b83e7b162
-  data.tar.gz: 4e7b93a612f88394024fd26d025cbca1cf3b1926ea27650a115efd89b9f8bda2aab52d55968d427d1e63a295d588407046841d00ef5823e80443bb4d73b3acd2
+  metadata.gz: 9df6cd1a8593620ac41fc08a9798b5c0e5c2973f62d8068605435f6d0231ab0ccd9555610645951d2550f7150753395f64d4ffd9d8fe74b40ffbce6a095f3ce1
+  data.tar.gz: c4d67ddff04232bead212dcc7632ac3e5195c29f0314a5137c0c2da57ba7805f386600f4a21fdd490d7a0988165974482fc1e60a7aed9227a9f37466b79e85eb

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

@@ -13,7 +13,8 @@ class RuboCop::AST::NodePattern::LexerRex
 macros
         CONST_NAME                /[A-Z:][a-zA-Z_:]+/
         SYMBOL_NAME               /[\w+@*\/?!<>=~|%^-]+|\[\]=?/
-        IDENTIFIER                /[a-zA-Z_][a-zA-Z0-9_-]*/
+        IDENTIFIER                /[a-z][a-zA-Z0-9_]*/
+        NODE_TYPE                 /[a-z][a-zA-Z0-9_-]*/  # Same as identifier but allows '-'
         CALL                      /(?:#{CONST_NAME}\.)?#{IDENTIFIER}[!?]?/
         REGEXP_BODY               /(?:[^\/]|\\\/)*/
         REGEXP                    /\/(#{REGEXP_BODY})(?<!\\)\/([imxo]*)/
@@ -27,14 +28,14 @@ rules
           %w"( ) { | } [ ] < > $ ! ^ ` ... + * ? ,"
         )}/o                      { emit ss.matched, &:to_sym }
         /#{REGEXP}/o              { emit_regexp }
-        /%(#{CONST_NAME})/o       { 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 }
         /\#(#{CALL})/o            { @state = :ARG; emit :tFUNCTION_CALL, &:to_sym }
         /#{IDENTIFIER}\?/o        { @state = :ARG; emit :tPREDICATE, &:to_sym }
-        /#{IDENTIFIER}/o          { emit :tNODE_TYPE, &:to_sym }
+        /#{NODE_TYPE}/o           { emit :tNODE_TYPE, &:to_sym }
   :ARG  /\(/                      { @state = nil; emit :tARG_LIST }
   :ARG  //                        { @state = nil }
         /\#.*/                    { emit_comment }

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

@@ -26,7 +26,8 @@ class RuboCop::AST::NodePattern::LexerRex
   # :stopdoc:
   CONST_NAME  = /[A-Z:][a-zA-Z_:]+/
   SYMBOL_NAME = /[\w+@*\/?!<>=~|%^-]+|\[\]=?/
-  IDENTIFIER  = /[a-zA-Z_][a-zA-Z0-9_-]*/
+  IDENTIFIER  = /[a-z][a-zA-Z0-9_]*/
+  NODE_TYPE   = /[a-z][a-zA-Z0-9_-]*/
   CALL        = /(?:#{CONST_NAME}\.)?#{IDENTIFIER}[!?]?/
   REGEXP_BODY = /(?:[^\/]|\\\/)*/
   REGEXP      = /\/(#{REGEXP_BODY})(?<!\\)\/([imxo]*)/
@@ -134,7 +135,7 @@ class RuboCop::AST::NodePattern::LexerRex
             action { emit ss.matched, &:to_sym }
           when ss.skip(/#{REGEXP}/o) then
             action { emit_regexp }
-          when ss.skip(/%(#{CONST_NAME})/o) then
+          when ss.skip(/%?(#{CONST_NAME})/o) then
             action { emit :tPARAM_CONST }
           when ss.skip(/%([a-z_]+)/) then
             action { emit :tPARAM_NAMED }
@@ -148,7 +149,7 @@ class RuboCop::AST::NodePattern::LexerRex
             action { @state = :ARG; emit :tFUNCTION_CALL, &:to_sym }
           when ss.skip(/#{IDENTIFIER}\?/o) then
             action { @state = :ARG; emit :tPREDICATE, &:to_sym }
-          when ss.skip(/#{IDENTIFIER}/o) then
+          when ss.skip(/#{NODE_TYPE}/o) then
             action { emit :tNODE_TYPE, &:to_sym }
           when ss.skip(/\#.*/) then
             action { emit_comment }

data/lib/rubocop/ast/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   module AST
     module Version
-      STRING = '1.2.0'
+      STRING = '1.3.0'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-ast
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-24 00:00:00.000000000 Z
+date: 2020-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser