kosmas58-cucumber 0.2.2.1 → 0.2.3.3

data/lib/cucumber/parser/feature.rb

@@ -56,15 +56,21 @@ module Cucumber
       end
 
       module Feature2
-        def build
-          background = bg.respond_to?(:build) ? bg.build : nil
-          Ast::Feature.new(
-            background, 
-            comment.build, 
-            tags.build, 
-            header.text_value, 
-            feature_elements.build(background)
-          )
+        def has_tags?(tag_names)
+          tags.has_tags?(tag_names)
+        end
+        
+        def build(filter)
+          if(filter.nil? || feature_elements.accept?(filter))
+            background = bg.respond_to?(:build) ? bg.build : nil
+            Ast::Feature.new(
+              background, 
+              comment.build, 
+              tags.build, 
+              header.text_value, 
+              feature_elements.build(background, filter)
+            )
+          end
         end
       end
 
@@ -118,12 +124,12 @@ module Cucumber
                       r8 = nil
                     else
                       self.index = i8
-                      r8 = SyntaxNode.new(input, index...index)
+                      r8 = instantiate_node(SyntaxNode,input, index...index)
                     end
                     s7 << r8
                     if r8
                       if index < input_length
-                        r13 = (SyntaxNode).new(input, index...(index + 1))
+                        r13 = instantiate_node(SyntaxNode,input, index...(index + 1))
                         @index += 1
                       else
                         terminal_parse_failure("any character")
@@ -132,7 +138,7 @@ module Cucumber
                       s7 << r13
                     end
                     if s7.last
-                      r7 = (SyntaxNode).new(input, i7...index, s7)
+                      r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
                       r7.extend(Feature0)
                     else
                       self.index = i7
@@ -144,14 +150,14 @@ module Cucumber
                       break
                     end
                   end
-                  r6 = SyntaxNode.new(input, i6...index, s6)
+                  r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
                   s0 << r6
                   if r6
                     r15 = _nt_background
                     if r15
                       r14 = r15
                     else
-                      r14 = SyntaxNode.new(input, index...index)
+                      r14 = instantiate_node(SyntaxNode,input, index...index)
                     end
                     s0 << r14
                     if r14
@@ -162,7 +168,7 @@ module Cucumber
                         if r18
                           r17 = r18
                         else
-                          r17 = SyntaxNode.new(input, index...index)
+                          r17 = instantiate_node(SyntaxNode,input, index...index)
                         end
                         s0 << r17
                       end
@@ -174,7 +180,7 @@ module Cucumber
           end
         end
         if s0.last
-          r0 = (SyntaxNode).new(input, i0...index, s0)
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
           r0.extend(Feature1)
           r0.extend(Feature2)
         else
@@ -205,10 +211,21 @@ module Cucumber
       end
 
       module Tags2
+        def at_line?(line)
+          ts.elements.detect{|e| e.tag.line == line}
+        end
+
+        def has_tags?(tags)
+          tag_names.detect{|tag_name| tags.index(tag_name)}
+        end
+
         def build
-          tag_names = ts.elements.map{|e| e.tag.tag_name.text_value}
           Ast::Tags.new(ts.line, tag_names)
         end
+        
+        def tag_names
+          ts.elements.map{|e| e.tag.tag_name.text_value}
+        end
       end
 
       def _nt_tags
@@ -254,12 +271,12 @@ module Cucumber
                 self.index = i5
                 r5 = nil
               else
-                r5 = SyntaxNode.new(input, i5...index, s5)
+                r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
               end
               s3 << r5
             end
             if s3.last
-              r3 = (SyntaxNode).new(input, i3...index, s3)
+              r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
               r3.extend(Tags0)
             else
               self.index = i3
@@ -271,11 +288,11 @@ module Cucumber
               break
             end
           end
-          r2 = SyntaxNode.new(input, i2...index, s2)
+          r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
           s0 << r2
         end
         if s0.last
-          r0 = (SyntaxNode).new(input, i0...index, s0)
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
           r0.extend(Tags1)
           r0.extend(Tags2)
         else
@@ -304,7 +321,7 @@ module Cucumber
 
         i0, s0 = index, []
         if input.index('@', index) == index
-          r1 = (SyntaxNode).new(input, index...(index + 1))
+          r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
           @index += 1
         else
           terminal_parse_failure('@')
@@ -315,7 +332,7 @@ module Cucumber
           s2, i2 = [], index
           loop do
             if input.index(Regexp.new('[^@\\r\\n\\t ]'), index) == index
-              r3 = (SyntaxNode).new(input, index...(index + 1))
+              r3 = instantiate_node(SyntaxNode,input, index...(index + 1))
               @index += 1
             else
               r3 = nil
@@ -330,12 +347,12 @@ module Cucumber
             self.index = i2
             r2 = nil
           else
-            r2 = SyntaxNode.new(input, i2...index, s2)
+            r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
           end
           s0 << r2
         end
         if s0.last
-          r0 = (SyntaxNode).new(input, i0...index, s0)
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
           r0.extend(Tag0)
         else
           self.index = i0
@@ -381,7 +398,7 @@ module Cucumber
             s1 << r3
           end
           if s1.last
-            r1 = (SyntaxNode).new(input, i1...index, s1)
+            r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
             r1.extend(Comment0)
           else
             self.index = i1
@@ -393,7 +410,7 @@ module Cucumber
             break
           end
         end
-        r0 = SyntaxNode.new(input, i0...index, s0)
+        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
         r0.extend(Comment1)
 
         node_cache[:comment][start_index] = r0
@@ -417,7 +434,7 @@ module Cucumber
 
         i0, s0 = index, []
         if input.index('#', index) == index
-          r1 = (SyntaxNode).new(input, index...(index + 1))
+          r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
           @index += 1
         else
           terminal_parse_failure('#')
@@ -429,7 +446,7 @@ module Cucumber
           s0 << r2
         end
         if s0.last
-          r0 = (SyntaxNode).new(input, i0...index, s0)
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
           r0.extend(CommentLine0)
         else
           self.index = i0
@@ -454,8 +471,12 @@ module Cucumber
           elements[2]
         end
 
+        def name
+          elements[4]
+        end
+
         def steps
-          elements[5]
+          elements[6]
         end
       end
 
@@ -464,7 +485,8 @@ module Cucumber
           Ast::Background.new(
             comment.build, 
             background_keyword.line,
-            background_keyword.text_value, 
+            background_keyword.text_value,
+            name.text_value, 
             steps.build
           )
          end
@@ -497,47 +519,56 @@ module Cucumber
                   break
                 end
               end
-              r4 = SyntaxNode.new(input, i4...index, s4)
+              r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
               s0 << r4
               if r4
-                i6 = index
-                s7, i7 = [], index
-                loop do
-                  r8 = _nt_eol
-                  if r8
-                    s7 << r8
-                  else
-                    break
-                  end
-                end
-                if s7.empty?
-                  self.index = i7
-                  r7 = nil
-                else
-                  r7 = SyntaxNode.new(input, i7...index, s7)
-                end
+                r7 = _nt_line_to_eol
                 if r7
                   r6 = r7
                 else
-                  r9 = _nt_eof
-                  if r9
-                    r6 = r9
-                  else
-                    self.index = i6
-                    r6 = nil
-                  end
+                  r6 = instantiate_node(SyntaxNode,input, index...index)
                 end
                 s0 << r6
                 if r6
-                  r10 = _nt_steps
-                  s0 << r10
+                  i8 = index
+                  s9, i9 = [], index
+                  loop do
+                    r10 = _nt_eol
+                    if r10
+                      s9 << r10
+                    else
+                      break
+                    end
+                  end
+                  if s9.empty?
+                    self.index = i9
+                    r9 = nil
+                  else
+                    r9 = instantiate_node(SyntaxNode,input, i9...index, s9)
+                  end
+                  if r9
+                    r8 = r9
+                  else
+                    r11 = _nt_eof
+                    if r11
+                      r8 = r11
+                    else
+                      self.index = i8
+                      r8 = nil
+                    end
+                  end
+                  s0 << r8
+                  if r8
+                    r12 = _nt_steps
+                    s0 << r12
+                  end
                 end
               end
             end
           end
         end
         if s0.last
-          r0 = (SyntaxNode).new(input, i0...index, s0)
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
           r0.extend(Background0)
           r0.extend(Background1)
         else
@@ -551,8 +582,16 @@ module Cucumber
       end
 
       module FeatureElements0
-        def build(background)
-          elements.map{|s| s.build(background)}
+        def accept?(filter)
+          filter.nil? || elements.empty? || elements.detect{|feature_element| filter.accept?(feature_element)}
+        end
+        
+        def build(background, filter)
+          elements.map do |feature_element|
+            if filter.nil? || filter.accept?(feature_element)
+              feature_element.build(background, filter)
+            end
+          end.compact
         end
       end
 
@@ -585,7 +624,7 @@ module Cucumber
             break
           end
         end
-        r0 = SyntaxNode.new(input, i0...index, s0)
+        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
         r0.extend(FeatureElements0)
 
         node_cache[:feature_elements][start_index] = r0
@@ -628,7 +667,22 @@ module Cucumber
       end
 
       module Scenario1
-        def build(background)
+        def at_line?(line)
+          scenario_keyword.line == line ||
+          steps.at_line?(line) ||
+          tags.at_line?(line)
+        end
+
+        def has_tags?(tag_names)
+          feature_tags = self.parent.parent.tags
+          tags.has_tags?(tag_names) || feature_tags.has_tags?(tag_names)
+        end
+
+        def matches_name?(name_to_match)
+          name.text_value == name_to_match
+        end
+
+        def build(background, filter)
           Ast::Scenario.new(
             background,
             comment.build, 
@@ -671,7 +725,7 @@ module Cucumber
                     break
                   end
                 end
-                r5 = SyntaxNode.new(input, i5...index, s5)
+                r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
                 s0 << r5
                 if r5
                   r7 = _nt_line_to_eol
@@ -694,7 +748,7 @@ module Cucumber
           end
         end
         if s0.last
-          r0 = (SyntaxNode).new(input, i0...index, s0)
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
           r0.extend(Scenario0)
           r0.extend(Scenario1)
         else
@@ -746,7 +800,27 @@ module Cucumber
       end
 
       module ScenarioOutline1
-        def build(background)
+        def at_line?(line)
+          outline_at_line?(line) ||
+          examples_sections.at_line?(line) ||
+          tags.at_line?(line)
+        end
+
+        def outline_at_line?(line)
+          scenario_outline_keyword.line == line ||
+          steps.at_line?(line)
+        end
+
+        def has_tags?(tag_names)
+          feature_tags = self.parent.parent.tags
+          tags.has_tags?(tag_names) || feature_tags.has_tags?(tag_names)
+        end
+
+        def matches_name?(name_to_match)
+          name.text_value == name_to_match
+        end
+
+        def build(background, filter)
           Ast::ScenarioOutline.new(
             background,
             comment.build, 
@@ -755,7 +829,7 @@ module Cucumber
             scenario_outline_keyword.text_value, 
             name.text_value, 
             steps.build, 
-            examples_sections.build
+            examples_sections.build(filter, self)
           )
         end
       end
@@ -790,7 +864,7 @@ module Cucumber
                     break
                   end
                 end
-                r5 = SyntaxNode.new(input, i5...index, s5)
+                r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
                 s0 << r5
                 if r5
                   r7 = _nt_line_to_eol
@@ -817,7 +891,7 @@ module Cucumber
           end
         end
         if s0.last
-          r0 = (SyntaxNode).new(input, i0...index, s0)
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
           r0.extend(ScenarioOutline0)
           r0.extend(ScenarioOutline1)
         else
@@ -831,6 +905,10 @@ module Cucumber
       end
 
       module Steps0
+        def at_line?(line)
+          elements.detect{|e| e.at_line?(line)}
+        end
+
         def build
           elements.map{|e| e.build}
         end
@@ -853,7 +931,7 @@ module Cucumber
             break
           end
         end
-        r0 = SyntaxNode.new(input, i0...index, s0)
+        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
         r0.extend(Steps0)
 
         node_cache[:steps][start_index] = r0
@@ -870,6 +948,10 @@ module Cucumber
           elements[2]
         end
 
+        def keyword_space
+          elements[3]
+        end
+
         def name
           elements[4]
         end
@@ -884,6 +966,11 @@ module Cucumber
       end
 
       module Step1
+        def at_line?(line)
+          step_keyword.line == line ||
+          (multi.respond_to?(:at_line?) && multi.at_line?(line))
+        end
+
         def build
           if multi.respond_to?(:build)
             Ast::Step.new(step_keyword.line, step_keyword.text_value, name.text_value.strip, multi.build)
@@ -914,66 +1001,57 @@ module Cucumber
               break
             end
           end
-          r2 = SyntaxNode.new(input, i2...index, s2)
+          r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
           s0 << r2
           if r2
             r4 = _nt_step_keyword
             s0 << r4
             if r4
-              s5, i5 = [], index
-              loop do
-                r6 = _nt_space
-                if r6
-                  s5 << r6
-                else
-                  break
-                end
-              end
-              r5 = SyntaxNode.new(input, i5...index, s5)
+              r5 = _nt_keyword_space
               s0 << r5
               if r5
-                r7 = _nt_line_to_eol
-                s0 << r7
-                if r7
-                  i8 = index
-                  s9, i9 = [], index
+                r6 = _nt_line_to_eol
+                s0 << r6
+                if r6
+                  i7 = index
+                  s8, i8 = [], index
                   loop do
-                    r10 = _nt_eol
-                    if r10
-                      s9 << r10
+                    r9 = _nt_eol
+                    if r9
+                      s8 << r9
                     else
                       break
                     end
                   end
-                  if s9.empty?
-                    self.index = i9
-                    r9 = nil
+                  if s8.empty?
+                    self.index = i8
+                    r8 = nil
                   else
-                    r9 = SyntaxNode.new(input, i9...index, s9)
+                    r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
                   end
-                  if r9
-                    r8 = r9
+                  if r8
+                    r7 = r8
                   else
-                    r11 = _nt_eof
-                    if r11
-                      r8 = r11
+                    r10 = _nt_eof
+                    if r10
+                      r7 = r10
                     else
-                      self.index = i8
-                      r8 = nil
+                      self.index = i7
+                      r7 = nil
                     end
                   end
-                  s0 << r8
-                  if r8
-                    r13 = _nt_multiline_arg
-                    if r13
-                      r12 = r13
+                  s0 << r7
+                  if r7
+                    r12 = _nt_multiline_arg
+                    if r12
+                      r11 = r12
                     else
-                      r12 = SyntaxNode.new(input, index...index)
+                      r11 = instantiate_node(SyntaxNode,input, index...index)
                     end
-                    s0 << r12
-                    if r12
-                      r14 = _nt_white
-                      s0 << r14
+                    s0 << r11
+                    if r11
+                      r13 = _nt_white
+                      s0 << r13
                     end
                   end
                 end
@@ -982,7 +1060,7 @@ module Cucumber
           end
         end
         if s0.last
-          r0 = (SyntaxNode).new(input, i0...index, s0)
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
           r0.extend(Step0)
           r0.extend(Step1)
         else
@@ -996,8 +1074,16 @@ module Cucumber
       end
 
       module ExamplesSections0
-        def build
-          elements.map{|e| e.build}
+        def at_line?(line)
+          elements.detect { |e| e.at_line?(line) }
+        end
+
+        def build(filter, scenario_outline)
+          elements.map do |e|
+            if(filter.nil? || filter.accept?(e) || filter.outline_at_line?(scenario_outline))
+              e.build(filter, scenario_outline)
+            end
+          end.compact
         end
       end
 
@@ -1018,7 +1104,7 @@ module Cucumber
             break
           end
         end
-        r0 = SyntaxNode.new(input, i0...index, s0)
+        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
         r0.extend(ExamplesSections0)
 
         node_cache[:examples_sections][start_index] = r0
@@ -1049,8 +1135,21 @@ module Cucumber
       end
 
       module Examples1
-        def build
-          [examples_keyword.line, examples_keyword.text_value, name.text_value, table.raw]
+        def at_line?(line)
+          examples_keyword.line == line ||
+          table.at_line?(line)
+        end
+
+        def has_tags?(tag_names)
+          true
+        end
+
+        def outline_at_line?(line)
+          true
+        end
+
+        def build(filter, scenario_outline)
+          [examples_keyword.line, examples_keyword.text_value, name.text_value, table.raw(filter, scenario_outline)]
         end
       end
 
@@ -1072,7 +1171,7 @@ module Cucumber
             break
           end
         end
-        r1 = SyntaxNode.new(input, i1...index, s1)
+        r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
         s0 << r1
         if r1
           r3 = _nt_examples_keyword
@@ -1087,14 +1186,14 @@ module Cucumber
                 break
               end
             end
-            r4 = SyntaxNode.new(input, i4...index, s4)
+            r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
             s0 << r4
             if r4
               r7 = _nt_line_to_eol
               if r7
                 r6 = r7
               else
-                r6 = SyntaxNode.new(input, index...index)
+                r6 = instantiate_node(SyntaxNode,input, index...index)
               end
               s0 << r6
               if r6
@@ -1113,7 +1212,7 @@ module Cucumber
           end
         end
         if s0.last
-          r0 = (SyntaxNode).new(input, i0...index, s0)
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
           r0.extend(Examples0)
           r0.extend(Examples1)
         else
@@ -1173,12 +1272,12 @@ module Cucumber
             r2 = nil
           else
             self.index = i2
-            r2 = SyntaxNode.new(input, index...index)
+            r2 = instantiate_node(SyntaxNode,input, index...index)
           end
           s1 << r2
           if r2
             if index < input_length
-              r4 = (SyntaxNode).new(input, index...(index + 1))
+              r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
               @index += 1
             else
               terminal_parse_failure("any character")
@@ -1187,7 +1286,7 @@ module Cucumber
             s1 << r4
           end
           if s1.last
-            r1 = (SyntaxNode).new(input, i1...index, s1)
+            r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
             r1.extend(LineToEol0)
           else
             self.index = i1
@@ -1199,7 +1298,7 @@ module Cucumber
             break
           end
         end
-        r0 = SyntaxNode.new(input, i0...index, s0)
+        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
 
         node_cache[:line_to_eol][start_index] = r0
 
@@ -1224,6 +1323,10 @@ module Cucumber
       end
 
       module PyString2
+        def at_line?(line)
+          line >= open_py_string.line && line <= close_py_string.line
+        end
+
         def build
           Ast::PyString.new(open_py_string.line, close_py_string.line, s.text_value, open_py_string.indentation)
         end
@@ -1250,12 +1353,12 @@ module Cucumber
               r4 = nil
             else
               self.index = i4
-              r4 = SyntaxNode.new(input, index...index)
+              r4 = instantiate_node(SyntaxNode,input, index...index)
             end
             s3 << r4
             if r4
               if index < input_length
-                r6 = (SyntaxNode).new(input, index...(index + 1))
+                r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
                 @index += 1
               else
                 terminal_parse_failure("any character")
@@ -1264,7 +1367,7 @@ module Cucumber
               s3 << r6
             end
             if s3.last
-              r3 = (SyntaxNode).new(input, i3...index, s3)
+              r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
               r3.extend(PyString0)
             else
               self.index = i3
@@ -1276,7 +1379,7 @@ module Cucumber
               break
             end
           end
-          r2 = SyntaxNode.new(input, i2...index, s2)
+          r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
           s0 << r2
           if r2
             r7 = _nt_close_py_string
@@ -1284,7 +1387,7 @@ module Cucumber
           end
         end
         if s0.last
-          r0 = (SyntaxNode).new(input, i0...index, s0)
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
           r0.extend(PyString1)
           r0.extend(PyString2)
         else
@@ -1330,7 +1433,7 @@ module Cucumber
         s0 << r1
         if r1
           if input.index('"""', index) == index
-            r2 = (SyntaxNode).new(input, index...(index + 3))
+            r2 = instantiate_node(SyntaxNode,input, index...(index + 3))
             @index += 3
           else
             terminal_parse_failure('"""')
@@ -1347,7 +1450,7 @@ module Cucumber
                 break
               end
             end
-            r3 = SyntaxNode.new(input, i3...index, s3)
+            r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
             s0 << r3
             if r3
               r5 = _nt_eol
@@ -1356,7 +1459,7 @@ module Cucumber
           end
         end
         if s0.last
-          r0 = (SyntaxNode).new(input, i0...index, s0)
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
           r0.extend(OpenPyString0)
           r0.extend(OpenPyString1)
         else
@@ -1410,11 +1513,11 @@ module Cucumber
               break
             end
           end
-          r2 = SyntaxNode.new(input, i2...index, s2)
+          r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
           s0 << r2
           if r2
             if input.index('"""', index) == index
-              r4 = (SyntaxNode).new(input, index...(index + 3))
+              r4 = instantiate_node(SyntaxNode,input, index...(index + 3))
               @index += 3
             else
               terminal_parse_failure('"""')
@@ -1428,7 +1531,7 @@ module Cucumber
           end
         end
         if s0.last
-          r0 = (SyntaxNode).new(input, i0...index, s0)
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
           r0.extend(ClosePyString0)
           r0.extend(ClosePyString1)
         else
@@ -1470,7 +1573,7 @@ module Cucumber
             break
           end
         end
-        r0 = SyntaxNode.new(input, i0...index, s0)
+        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
 
         node_cache[:white][start_index] = r0