cucumber 0.4.3 → 0.4.4

data/lib/cucumber/parser/feature.tt

@@ -76,8 +76,8 @@ module Cucumber
             steps.at_line?(line)
           end
 
-          def matches_tags?(tag_names)
-            Ast::Tags.matches?(self.parent.tags.tag_names, tag_names)
+          def matches_tags?(tag_name_lists)
+            Ast::Tags.matches?(self.parent.tags.tag_names, tag_name_lists)
           end
 
           def build
@@ -116,10 +116,10 @@ module Cucumber
             tags.at_line?(line)
           end
 
-          def matches_tags?(tag_names)
+          def matches_tags?(tag_name_lists)
             feature_tag_names = self.parent.parent.tags.tag_names
             source_tag_names = (feature_tag_names + tags.tag_names).uniq
-            Ast::Tags.matches?(source_tag_names, tag_names)
+            Ast::Tags.matches?(source_tag_names, tag_name_lists)
           end
 
           def matches_name?(regexp_to_match)
@@ -153,10 +153,10 @@ module Cucumber
             steps.at_line?(line)
           end
 
-          def matches_tags?(tag_names)
+          def matches_tags?(tag_name_lists)
             feature_tag_names = self.parent.parent.tags.tag_names
             source_tag_names = (feature_tag_names + tags.tag_names).uniq
-            Ast::Tags.matches?(source_tag_names, tag_names)
+            Ast::Tags.matches?(source_tag_names, tag_name_lists)
           end
 
           def matches_name?(regexp_to_match)
@@ -238,7 +238,7 @@ module Cucumber
             table.at_line?(line)
           end
 
-          def matches_tags?(tag_names)
+          def matches_tags?(tag_name_lists)
             true
           end
 
@@ -276,42 +276,6 @@ module Cucumber
         (step_keyword keyword_space) / scenario_keyword / scenario_outline_keyword / table / tag / comment_line
       end
 
-      rule py_string
-        open_py_string s:(!close_py_string .)* close_py_string {
-          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
-        }
-      end
-
-      rule open_py_string
-        indent:space* '"""' space* eol {
-          def indentation
-            indent.text_value.length
-          end
-
-          def line
-            indent.line
-          end
-        }
-      end
-
-      rule close_py_string
-        eol space* quotes:'"""' white {
-          def line
-            quotes.line
-          end
-        }
-      end
-
-      rule white
-        (space / eol)*
-      end
-
     end
   end
 end

data/lib/cucumber/parser/i18n.tt

@@ -2,8 +2,10 @@ module Cucumber
   module Parser
     module I18n
       grammar <%= keywords('grammar_name', true) %>
+        include Common
         include Feature
         include Table
+        include PyString
 
         rule feature
           feature_sub

data/lib/cucumber/parser/natural_language.rb

@@ -18,6 +18,7 @@ module Cucumber
         raise "Language not supported: #{lang.inspect}" if @keywords.nil?
         @keywords['grammar_name'] = @keywords['name'].gsub(/\s/, '')
         register_adverbs(step_mother) if step_mother
+        @parser = nil
       end
 
       def register_adverbs(step_mother)
@@ -67,6 +68,14 @@ module Cucumber
       def and_keywords
         @keywords['and'].split('|')
       end
+
+      def step_keywords
+        %w{given when then and but}.map{|key| @keywords[key].split('|')}.flatten.uniq
+      end
+
+      def space_after_keyword
+        @keywords['space_after_keyword']
+      end
     end
   end
 end

data/lib/cucumber/parser/py_string.rb

@@ -0,0 +1,276 @@
+# Autogenerated from a Treetop grammar. Edits may be lost.
+
+
+module Cucumber
+  module Parser
+    # TIP: When you hack on the grammar, just delete py_string.rb in this directory.
+    # Also make sure you have uninstalled all cucumber gems (don't forget xxx-cucumber
+    # github gems).
+    #
+    # Treetop will then generate the parser in-memory. When you're happy, just generate
+    # the rb file with tt feature.tt
+    module PyString
+      include Treetop::Runtime
+
+      def root
+        @root || :py_string
+      end
+
+      include Common
+
+      module PyString0
+      end
+
+      module PyString1
+        def open_py_string
+          elements[0]
+        end
+
+        def s
+          elements[1]
+        end
+
+        def close_py_string
+          elements[2]
+        end
+      end
+
+      module PyString2
+        def at_line?(line)
+          line >= open_py_string.line && line <= close_py_string.line
+        end
+
+        def build(filter=nil)
+          Ast::PyString.new(open_py_string.line, close_py_string.line, s.text_value, open_py_string.indentation)
+        end
+      end
+
+      def _nt_py_string
+        start_index = index
+        if node_cache[:py_string].has_key?(index)
+          cached = node_cache[:py_string][index]
+          @index = cached.interval.end if cached
+          return cached
+        end
+
+        i0, s0 = index, []
+        r1 = _nt_open_py_string
+        s0 << r1
+        if r1
+          s2, i2 = [], index
+          loop do
+            i3, s3 = index, []
+            i4 = index
+            r5 = _nt_close_py_string
+            if r5
+              r4 = nil
+            else
+              @index = i4
+              r4 = instantiate_node(SyntaxNode,input, index...index)
+            end
+            s3 << r4
+            if r4
+              if index < input_length
+                r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                @index += 1
+              else
+                terminal_parse_failure("any character")
+                r6 = nil
+              end
+              s3 << r6
+            end
+            if s3.last
+              r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+              r3.extend(PyString0)
+            else
+              @index = i3
+              r3 = nil
+            end
+            if r3
+              s2 << r3
+            else
+              break
+            end
+          end
+          r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
+          s0 << r2
+          if r2
+            r7 = _nt_close_py_string
+            s0 << r7
+          end
+        end
+        if s0.last
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+          r0.extend(PyString1)
+          r0.extend(PyString2)
+        else
+          @index = i0
+          r0 = nil
+        end
+
+        node_cache[:py_string][start_index] = r0
+
+        r0
+      end
+
+      module OpenPyString0
+        def indent
+          elements[0]
+        end
+
+        def eol
+          elements[3]
+        end
+      end
+
+      module OpenPyString1
+        def indentation
+          indent.text_value.length
+        end
+
+        def line
+          indent.line
+        end
+      end
+
+      def _nt_open_py_string
+        start_index = index
+        if node_cache[:open_py_string].has_key?(index)
+          cached = node_cache[:open_py_string][index]
+          @index = cached.interval.end if cached
+          return cached
+        end
+
+        i0, s0 = index, []
+        s1, i1 = [], index
+        loop do
+          r2 = _nt_space
+          if r2
+            s1 << r2
+          else
+            break
+          end
+        end
+        r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+        s0 << r1
+        if r1
+          if has_terminal?('"""', false, index)
+            r3 = instantiate_node(SyntaxNode,input, index...(index + 3))
+            @index += 3
+          else
+            terminal_parse_failure('"""')
+            r3 = nil
+          end
+          s0 << r3
+          if r3
+            s4, i4 = [], index
+            loop do
+              r5 = _nt_space
+              if r5
+                s4 << r5
+              else
+                break
+              end
+            end
+            r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
+            s0 << r4
+            if r4
+              r6 = _nt_eol
+              s0 << r6
+            end
+          end
+        end
+        if s0.last
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+          r0.extend(OpenPyString0)
+          r0.extend(OpenPyString1)
+        else
+          @index = i0
+          r0 = nil
+        end
+
+        node_cache[:open_py_string][start_index] = r0
+
+        r0
+      end
+
+      module ClosePyString0
+        def eol
+          elements[0]
+        end
+
+        def quotes
+          elements[2]
+        end
+
+        def white
+          elements[3]
+        end
+      end
+
+      module ClosePyString1
+        def line
+          quotes.line
+        end
+      end
+
+      def _nt_close_py_string
+        start_index = index
+        if node_cache[:close_py_string].has_key?(index)
+          cached = node_cache[:close_py_string][index]
+          @index = cached.interval.end if cached
+          return cached
+        end
+
+        i0, s0 = index, []
+        r1 = _nt_eol
+        s0 << r1
+        if r1
+          s2, i2 = [], index
+          loop do
+            r3 = _nt_space
+            if r3
+              s2 << r3
+            else
+              break
+            end
+          end
+          r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
+          s0 << r2
+          if r2
+            if has_terminal?('"""', false, index)
+              r4 = instantiate_node(SyntaxNode,input, index...(index + 3))
+              @index += 3
+            else
+              terminal_parse_failure('"""')
+              r4 = nil
+            end
+            s0 << r4
+            if r4
+              r5 = _nt_white
+              s0 << r5
+            end
+          end
+        end
+        if s0.last
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+          r0.extend(ClosePyString0)
+          r0.extend(ClosePyString1)
+        else
+          @index = i0
+          r0 = nil
+        end
+
+        node_cache[:close_py_string][start_index] = r0
+
+        r0
+      end
+
+    end
+
+    class PyStringParser < Treetop::Runtime::CompiledParser
+      include PyString
+    end
+
+  end
+end

data/lib/cucumber/parser/py_string.tt

@@ -0,0 +1,45 @@
+module Cucumber
+  module Parser
+    # TIP: When you hack on the grammar, just delete py_string.rb in this directory.
+    # Also make sure you have uninstalled all cucumber gems (don't forget xxx-cucumber
+    # github gems).
+    #
+    # Treetop will then generate the parser in-memory. When you're happy, just generate
+    # the rb file with tt feature.tt
+    grammar PyString
+      include Common
+
+      rule py_string
+        open_py_string s:(!close_py_string .)* close_py_string {
+          def at_line?(line)
+            line >= open_py_string.line && line <= close_py_string.line
+          end
+
+          def build(filter=nil)
+            Ast::PyString.new(open_py_string.line, close_py_string.line, s.text_value, open_py_string.indentation)
+          end
+        }
+      end
+
+      rule open_py_string
+        indent:space* '"""' space* eol {
+          def indentation
+            indent.text_value.length
+          end
+
+          def line
+            indent.line
+          end
+        }
+      end
+
+      rule close_py_string
+        eol space* quotes:'"""' white {
+          def line
+            quotes.line
+          end
+        }
+      end
+    end
+  end
+end

data/lib/cucumber/parser/table.rb

@@ -3,7 +3,7 @@
 
 module Cucumber
   module Parser
-    # TIP: When you hack on the grammar, just delete feature.rb in this directory.
+    # TIP: When you hack on the grammar, just delete table.rb in this directory.
     # Also make sure you have uninstalled all cucumber gems (don't forget xxx-cucumber
     # github gems).
     #
@@ -16,6 +16,8 @@ module Cucumber
         @root || :table
       end
 
+      include Common
+
       module Table0
         def at_line?(line)
           elements.detect{|table_row| table_row.at_line?(line)}
@@ -265,9 +267,8 @@ module Cucumber
           s1 << r2
           if r2
             if index < input_length
-              next_character = index + input[index..-1].match(/\A(.)/um).end(1)
-              r6 = instantiate_node(SyntaxNode,input, index...next_character)
-              @index = next_character
+              r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
+              @index += 1
             else
               terminal_parse_failure("any character")
               r6 = nil
@@ -294,122 +295,6 @@ module Cucumber
         r0
       end
 
-      def _nt_space
-        start_index = index
-        if node_cache[:space].has_key?(index)
-          cached = node_cache[:space][index]
-          @index = cached.interval.end if cached
-          return cached
-        end
-
-        if has_terminal?('\G[ \\t]', true, index)
-          next_character = index + input[index..-1].match(/\A(.)/um).end(1)
-          r0 = instantiate_node(SyntaxNode, input, index...next_character)
-          @index = next_character
-        else
-          r0 = nil
-        end
-
-        node_cache[:space][start_index] = r0
-
-        r0
-      end
-
-      module Eol0
-      end
-
-      def _nt_eol
-        start_index = index
-        if node_cache[:eol].has_key?(index)
-          cached = node_cache[:eol][index]
-          @index = cached.interval.end if cached
-          return cached
-        end
-
-        i0 = index
-        if has_terminal?("\n", false, index)
-          r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
-        else
-          terminal_parse_failure("\n")
-          r1 = nil
-        end
-        if r1
-          r0 = r1
-        else
-          i2, s2 = index, []
-          if has_terminal?("\r", false, index)
-            r3 = instantiate_node(SyntaxNode,input, index...(index + 1))
-            @index += 1
-          else
-            terminal_parse_failure("\r")
-            r3 = nil
-          end
-          s2 << r3
-          if r3
-            if has_terminal?("\n", false, index)
-              r5 = instantiate_node(SyntaxNode,input, index...(index + 1))
-              @index += 1
-            else
-              terminal_parse_failure("\n")
-              r5 = nil
-            end
-            if r5
-              r4 = r5
-            else
-              r4 = instantiate_node(SyntaxNode,input, index...index)
-            end
-            s2 << r4
-          end
-          if s2.last
-            r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
-            r2.extend(Eol0)
-          else
-            @index = i2
-            r2 = nil
-          end
-          if r2
-            r0 = r2
-          else
-            @index = i0
-            r0 = nil
-          end
-        end
-
-        node_cache[:eol][start_index] = r0
-
-        r0
-      end
-
-      def _nt_eof
-        start_index = index
-        if node_cache[:eof].has_key?(index)
-          cached = node_cache[:eof][index]
-          @index = cached.interval.end if cached
-          return cached
-        end
-
-        i0 = index
-        if index < input_length
-          next_character = index + input[index..-1].match(/\A(.)/um).end(1)
-          r1 = instantiate_node(SyntaxNode,input, index...next_character)
-          @index = next_character
-        else
-          terminal_parse_failure("any character")
-          r1 = nil
-        end
-        if r1
-          r0 = nil
-        else
-          @index = i0
-          r0 = instantiate_node(SyntaxNode,input, index...index)
-        end
-
-        node_cache[:eof][start_index] = r0
-
-        r0
-      end
-
     end
 
     class TableParser < Treetop::Runtime::CompiledParser