NodePattern: Fix $<>

rubocop · Apr 29, 2019 · 666587c · 666587c
1 parent 87a6ec4
commit 666587c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/lib/rubocop/node_pattern.rb b/lib/rubocop/node_pattern.rb
@@ -106,7 +106,7 @@ class NodePattern
     class Compiler
       SYMBOL       = %r{:(?:[\w+@*/?!<>=~|%^-]+|\[\]=?)}.freeze
       IDENTIFIER   = /[a-zA-Z_][a-zA-Z0-9_-]*/.freeze
-      META         = /\(|\)|\{|\}|\[|\]|\<|\>|\$\.\.\.|\$|!|\^|\.\.\./.freeze
+      META         = Regexp.union(%w"( ) { } [ ] $< < > $... $ ! ^ ...").freeze
       NUMBER       = /-?\d+(?:\.\d+)?/.freeze
       STRING       = /".+?"/.freeze
       METHOD_NAME  = /\#?#{IDENTIFIER}[\!\?]?\(?/.freeze
@@ -143,7 +143,9 @@ class Compiler
       line = __LINE__
       ANY_ORDER_TEMPLATE = ERB.new <<-RUBY.strip_indent.gsub("-%>\n", '%>')
         <% if capture_rest %>(<%= capture_rest %> = []) && <% end -%>
-        <%= CUR_NODE %>.children[<%= range %>].each_with_object({}) { |<%= child %>, <%= matched %>|
+        <% if capture_all %>(<%= capture_all %> = <% end -%>
+        <%= CUR_NODE %>.children[<%= range %>]<% if capture_all %>)<% end -%>
+        .each_with_object({}) { |<%= child %>, <%= matched %>|
           case
           <% patterns.each_with_index do |pattern, i| -%>
           when !<%= matched %>[<%= i %>] && <%=
@@ -234,6 +236,7 @@ def variadic_seq_term
         case token
         when CAPTURED_REST then compile_captured_ellipsis
         when REST          then compile_ellipsis
+        when '$<'          then compile_any_order(next_capture)
         when '<'           then compile_any_order
         else                    [1, compile_expr(token)]
         end
@@ -351,7 +354,8 @@ def compile_ellipsis
         [0..Float::INFINITY, 'true']
       end
 
-      def compile_any_order # rubocop:disable Metrics/MethodLength
+      # rubocop:disable Metrics/MethodLength
+      def compile_any_order(capture_all = nil)
         rest = capture_rest = nil
         patterns = []
         with_temp_variables do |child, matched|
@@ -368,6 +372,7 @@ def compile_any_order # rubocop:disable Metrics/MethodLength
            ->(range) { ANY_ORDER_TEMPLATE.result(binding) }]
         end
       end
+      # rubocop:enable Metrics/MethodLength
 
       def insure_same_captures(enum, what)
         return to_enum __method__, enum, what unless block_given?

diff --git a/spec/rubocop/node_pattern_spec.rb b/spec/rubocop/node_pattern_spec.rb
@@ -127,6 +127,7 @@
 
     describe 'yaml compatibility' do
       let(:instance) do
+        $VERBOSE = false
         YAML.safe_load(YAML.dump(super()), [described_class])
       end
       let(:ruby) { 'obj.method' }
@@ -1354,6 +1355,15 @@ def withargs(foo, bar, qux)
       it_behaves_like 'single capture'
     end
 
+    context 'captured' do
+      context 'without ellipsis' do
+        let(:pattern) { '(array sym $<int int _ _>)' }
+        let(:captured_val) { node.children.last(4) }
+
+        it_behaves_like 'single capture'
+      end
+    end
+
     context 'doubled' do
       context 'separated by fixed argument' do
         let(:pattern) { '(array <(str $_) (sym $_)> $_ <(int 3) (int $_)>)' }