cucumber 0.1.7 → 0.1.8

data/lib/cucumber/treetop_parser/feature_se.rb

@@ -10,11 +10,11 @@ module Feature #:nodoc:
 
   module Root0 #:nodoc:
     def header #:nodoc:
-      elements[0]
+      elements[1]
     end
 
     def scenario_sequence #:nodoc:
-      elements[1]
+      elements[2]
     end
 
   end
@@ -36,19 +36,28 @@ module Feature #:nodoc:
     end
 
     i0, s0 = index, []
-    r1 = _nt_header
+    r2 = _nt_space
+    if r2
+      r1 = r2
+    else
+      r1 = SyntaxNode.new(input, index...index)
+    end
     s0 << r1
     if r1
-      r2 = _nt_scenario_sequence
-      s0 << r2
-      if r2
-        r4 = _nt_space
+      r3 = _nt_header
+      s0 << r3
+      if r3
+        r4 = _nt_scenario_sequence
+        s0 << r4
         if r4
-          r3 = r4
-        else
-          r3 = SyntaxNode.new(input, index...index)
+          r6 = _nt_space
+          if r6
+            r5 = r6
+          else
+            r5 = SyntaxNode.new(input, index...index)
+          end
+          s0 << r5
         end
-        s0 << r3
       end
     end
     if s0.last
@@ -80,7 +89,19 @@ module Feature #:nodoc:
     loop do
       i1, s1 = index, []
       i2 = index
-      r3 = _nt_scenario_keyword
+      i3 = index
+      r4 = _nt_scenario_keyword
+      if r4
+        r3 = r4
+      else
+        r5 = _nt_comment_to_eol
+        if r5
+          r3 = r5
+        else
+          self.index = i3
+          r3 = nil
+        end
+      end
       if r3
         r2 = nil
       else
@@ -90,13 +111,13 @@ module Feature #:nodoc:
       s1 << r2
       if r2
         if index < input_length
-          r4 = (SyntaxNode).new(input, index...(index + 1))
+          r6 = (SyntaxNode).new(input, index...(index + 1))
           @index += 1
         else
           terminal_parse_failure("any character")
-          r4 = nil
+          r6 = nil
         end
-        s1 << r4
+        s1 << r6
       end
       if s1.last
         r1 = (SyntaxNode).new(input, i1...index, s1)
@@ -226,10 +247,6 @@ module Feature #:nodoc:
       elements[0]
     end
 
-    def space #:nodoc:
-      elements[1]
-    end
-
     def name #:nodoc:
       elements[2]
     end
@@ -241,7 +258,8 @@ module Feature #:nodoc:
 
   module Scenario2 #:nodoc:
     def compile(feature) #:nodoc:
-      scenario = feature.add_scenario(name.text_value.strip)
+      line = input.line_of(interval.first)
+      scenario = feature.add_scenario(name.text_value.strip, line)
       steps.step_sequence.compile(scenario) if steps.respond_to?(:step_sequence)
       # TODO - GET RID OF THIS last_scenario NASTINESS
       # Use a better datastructure, like a linked list...
@@ -261,32 +279,37 @@ module Feature #:nodoc:
     r1 = _nt_scenario_keyword
     s0 << r1
     if r1
-      r2 = _nt_space
+      r3 = _nt_space
+      if r3
+        r2 = r3
+      else
+        r2 = SyntaxNode.new(input, index...index)
+      end
       s0 << r2
       if r2
-        r3 = _nt_line_to_eol
-        s0 << r3
-        if r3
-          i5, s5 = index, []
-          r6 = _nt_space
-          s5 << r6
-          if r6
-            r7 = _nt_step_sequence
-            s5 << r7
+        r4 = _nt_line_to_eol
+        s0 << r4
+        if r4
+          i6, s6 = index, []
+          r7 = _nt_space
+          s6 << r7
+          if r7
+            r8 = _nt_step_sequence
+            s6 << r8
           end
-          if s5.last
-            r5 = (SyntaxNode).new(input, i5...index, s5)
-            r5.extend(Scenario0)
+          if s6.last
+            r6 = (SyntaxNode).new(input, i6...index, s6)
+            r6.extend(Scenario0)
           else
-            self.index = i5
-            r5 = nil
+            self.index = i6
+            r6 = nil
           end
-          if r5
-            r4 = r5
+          if r6
+            r5 = r6
           else
-            r4 = SyntaxNode.new(input, index...index)
+            r5 = SyntaxNode.new(input, index...index)
           end
-          s0 << r4
+          s0 << r5
         end
       end
     end
@@ -317,7 +340,7 @@ module Feature #:nodoc:
     if r1
       r0 = r1
     else
-      r2 = _nt_table
+      r2 = _nt_more_examples
       if r2
         r0 = r2
       else
@@ -331,6 +354,59 @@ module Feature #:nodoc:
     return r0
   end
 
+  module MoreExamples0 #:nodoc:
+    def more_examples_keyword #:nodoc:
+      elements[0]
+    end
+
+    def space #:nodoc:
+      elements[1]
+    end
+
+    def table #:nodoc:
+      elements[2]
+    end
+  end
+
+  module MoreExamples1 #:nodoc:
+    def compile(f) #:nodoc:
+      table.compile(f)
+    end
+  end
+
+  def _nt_more_examples #:nodoc:
+    start_index = index
+    if node_cache[:more_examples].has_key?(index)
+      cached = node_cache[:more_examples][index]
+      @index = cached.interval.end if cached
+      return cached
+    end
+
+    i0, s0 = index, []
+    r1 = _nt_more_examples_keyword
+    s0 << r1
+    if r1
+      r2 = _nt_space
+      s0 << r2
+      if r2
+        r3 = _nt_table
+        s0 << r3
+      end
+    end
+    if s0.last
+      r0 = (SyntaxNode).new(input, i0...index, s0)
+      r0.extend(MoreExamples0)
+      r0.extend(MoreExamples1)
+    else
+      self.index = i0
+      r0 = nil
+    end
+
+    node_cache[:more_examples][start_index] = r0
+
+    return r0
+  end
+
   module Table0 #:nodoc:
     def eol #:nodoc:
       elements[1]
@@ -358,7 +434,17 @@ module Feature #:nodoc:
         feature.add_row_scenario(Feature.last_scenario, table_line.cell_values, table_line.line)
       end
     end
-
+    
+    def matrix #:nodoc:
+      ([head] + body).map do |table_line|
+        table_line.cell_values # We're losing the line - we'll get it back when we make our own class #:nodoc:
+      end
+    end
+    
+    def to_arg #:nodoc:
+      Model::Table.new(matrix)
+    end
+    
     def body #:nodoc:
       super.elements.map { |elt| elt.table_line }
     end
@@ -729,10 +815,6 @@ module Feature #:nodoc:
       elements[0]
     end
 
-    def space #:nodoc:
-      elements[1]
-    end
-
     def name #:nodoc:
       elements[2]
     end
@@ -757,11 +839,16 @@ module Feature #:nodoc:
     r1 = _nt_given_scenario_keyword
     s0 << r1
     if r1
-      r2 = _nt_space
+      r3 = _nt_space
+      if r3
+        r2 = r3
+      else
+        r2 = SyntaxNode.new(input, index...index)
+      end
       s0 << r2
       if r2
-        r3 = _nt_line_to_eol
-        s0 << r3
+        r4 = _nt_line_to_eol
+        s0 << r4
       end
     end
     if s0.last
@@ -779,23 +866,36 @@ module Feature #:nodoc:
   end
 
   module PlainStep0 #:nodoc:
-    def step_keyword #:nodoc:
+    def space #:nodoc:
       elements[0]
     end
 
-    def space #:nodoc:
+    def multiline_arg #:nodoc:
       elements[1]
     end
+  end
+
+  module PlainStep1 #:nodoc:
+    def step_keyword #:nodoc:
+      elements[0]
+    end
 
     def name #:nodoc:
       elements[2]
     end
+
+    def multi #:nodoc:
+      elements[3]
+    end
   end
 
-  module PlainStep1 #:nodoc:
+  module PlainStep2 #:nodoc:
     def compile(scenario) #:nodoc:
       line = input.line_of(interval.first)
-      scenario.create_step(step_keyword.text_value, name.text_value.strip, line)
+      step = scenario.create_step(step_keyword.text_value, name.text_value.strip, line)
+      if multi.respond_to?(:multiline_arg)
+        step.extra_args << multi.multiline_arg.to_arg
+      end
     end
   end
 
@@ -811,17 +911,44 @@ module Feature #:nodoc:
     r1 = _nt_step_keyword
     s0 << r1
     if r1
-      r2 = _nt_space
+      r3 = _nt_space
+      if r3
+        r2 = r3
+      else
+        r2 = SyntaxNode.new(input, index...index)
+      end
       s0 << r2
       if r2
-        r3 = _nt_line_to_eol
-        s0 << r3
+        r4 = _nt_line_to_eol
+        s0 << r4
+        if r4
+          i6, s6 = index, []
+          r7 = _nt_space
+          s6 << r7
+          if r7
+            r8 = _nt_multiline_arg
+            s6 << r8
+          end
+          if s6.last
+            r6 = (SyntaxNode).new(input, i6...index, s6)
+            r6.extend(PlainStep0)
+          else
+            self.index = i6
+            r6 = nil
+          end
+          if r6
+            r5 = r6
+          else
+            r5 = SyntaxNode.new(input, index...index)
+          end
+          s0 << r5
+        end
       end
     end
     if s0.last
       r0 = (SyntaxNode).new(input, i0...index, s0)
-      r0.extend(PlainStep0)
       r0.extend(PlainStep1)
+      r0.extend(PlainStep2)
     else
       self.index = i0
       r0 = nil
@@ -832,6 +959,145 @@ module Feature #:nodoc:
     return r0
   end
 
+  def _nt_multiline_arg #:nodoc:
+    start_index = index
+    if node_cache[:multiline_arg].has_key?(index)
+      cached = node_cache[:multiline_arg][index]
+      @index = cached.interval.end if cached
+      return cached
+    end
+
+    i0 = index
+    r1 = _nt_table
+    if r1
+      r0 = r1
+    else
+      r2 = _nt_multiline_string
+      if r2
+        r0 = r2
+      else
+        self.index = i0
+        r0 = nil
+      end
+    end
+
+    node_cache[:multiline_arg][start_index] = r0
+
+    return r0
+  end
+
+  module MultilineString0 #:nodoc:
+  end
+
+  module MultilineString1 #:nodoc:
+    def quote #:nodoc:
+      elements[0]
+    end
+
+    def string #:nodoc:
+      elements[1]
+    end
+
+    def quote #:nodoc:
+      elements[2]
+    end
+  end
+
+  module MultilineString2 #:nodoc:
+    def to_arg #:nodoc:
+      string.text_value.split("\n").map{|l| l.strip}.join("\n")
+    end
+  end
+
+  def _nt_multiline_string #:nodoc:
+    start_index = index
+    if node_cache[:multiline_string].has_key?(index)
+      cached = node_cache[:multiline_string][index]
+      @index = cached.interval.end if cached
+      return cached
+    end
+
+    i0, s0 = index, []
+    r1 = _nt_quote
+    s0 << r1
+    if r1
+      s2, i2 = [], index
+      loop do
+        i3, s3 = index, []
+        i4 = index
+        r5 = _nt_quote
+        if r5
+          r4 = nil
+        else
+          self.index = i4
+          r4 = SyntaxNode.new(input, index...index)
+        end
+        s3 << r4
+        if r4
+          if index < input_length
+            r6 = (SyntaxNode).new(input, index...(index + 1))
+            @index += 1
+          else
+            terminal_parse_failure("any character")
+            r6 = nil
+          end
+          s3 << r6
+        end
+        if s3.last
+          r3 = (SyntaxNode).new(input, i3...index, s3)
+          r3.extend(MultilineString0)
+        else
+          self.index = i3
+          r3 = nil
+        end
+        if r3
+          s2 << r3
+        else
+          break
+        end
+      end
+      r2 = SyntaxNode.new(input, i2...index, s2)
+      s0 << r2
+      if r2
+        r7 = _nt_quote
+        s0 << r7
+      end
+    end
+    if s0.last
+      r0 = (SyntaxNode).new(input, i0...index, s0)
+      r0.extend(MultilineString1)
+      r0.extend(MultilineString2)
+    else
+      self.index = i0
+      r0 = nil
+    end
+
+    node_cache[:multiline_string][start_index] = r0
+
+    return r0
+  end
+
+  def _nt_quote #:nodoc:
+    start_index = index
+    if node_cache[:quote].has_key?(index)
+      cached = node_cache[:quote][index]
+      @index = cached.interval.end if cached
+      return cached
+    end
+
+    if input.index('"', index) == index
+      r0 = (SyntaxNode).new(input, index...(index + 1))
+      @index += 1
+    else
+      terminal_parse_failure('"')
+      r0 = nil
+    end
+
+    node_cache[:quote][start_index] = r0
+
+    return r0
+  end
+
   def _nt_separator #:nodoc:
     start_index = index
     if node_cache[:separator].has_key?(index)
@@ -1109,51 +1375,51 @@ module Feature #:nodoc:
     end
 
     i0 = index
-    if input.index('Gitt', index) == index
-      r1 = (SyntaxNode).new(input, index...(index + 4))
-      @index += 4
+    if input.index("Givet", index) == index
+      r1 = (SyntaxNode).new(input, index...(index + 5))
+      @index += 5
     else
-      terminal_parse_failure('Gitt')
+      terminal_parse_failure("Givet")
       r1 = nil
     end
     if r1
       r0 = r1
     else
-      if input.index('Når', index) == index
+      if input.index("När", index) == index
         r2 = (SyntaxNode).new(input, index...(index + 4))
         @index += 4
       else
-        terminal_parse_failure('Når')
+        terminal_parse_failure("När")
         r2 = nil
       end
       if r2
         r0 = r2
       else
-        if input.index('Så', index) == index
+        if input.index("Så", index) == index
           r3 = (SyntaxNode).new(input, index...(index + 3))
           @index += 3
         else
-          terminal_parse_failure('Så')
+          terminal_parse_failure("Så")
           r3 = nil
         end
         if r3
           r0 = r3
         else
-          if input.index('Och', index) == index
+          if input.index("Och", index) == index
             r4 = (SyntaxNode).new(input, index...(index + 3))
             @index += 3
           else
-            terminal_parse_failure('Och')
+            terminal_parse_failure("Och")
             r4 = nil
           end
           if r4
             r0 = r4
           else
-            if input.index('Men', index) == index
+            if input.index("Men", index) == index
               r5 = (SyntaxNode).new(input, index...(index + 3))
               @index += 3
             else
-              terminal_parse_failure('Men')
+              terminal_parse_failure("Men")
               r5 = nil
             end
             if r5
@@ -1172,6 +1438,9 @@ module Feature #:nodoc:
     return r0
   end
 
+  module ScenarioKeyword0 #:nodoc:
+  end
+
   def _nt_scenario_keyword #:nodoc:
     start_index = index
     if node_cache[:scenario_keyword].has_key?(index)
@@ -1180,11 +1449,35 @@ module Feature #:nodoc:
       return cached
     end
 
-    if input.index('Scenario:', index) == index
-      r0 = (SyntaxNode).new(input, index...(index + 9))
-      @index += 9
+    i0, s0 = index, []
+    if input.index("Scenario", index) == index
+      r1 = (SyntaxNode).new(input, index...(index + 8))
+      @index += 8
+    else
+      terminal_parse_failure("Scenario")
+      r1 = nil
+    end
+    s0 << r1
+    if r1
+      if input.index(":", index) == index
+        r3 = (SyntaxNode).new(input, index...(index + 1))
+        @index += 1
+      else
+        terminal_parse_failure(":")
+        r3 = nil
+      end
+      if r3
+        r2 = r3
+      else
+        r2 = SyntaxNode.new(input, index...index)
+      end
+      s0 << r2
+    end
+    if s0.last
+      r0 = (SyntaxNode).new(input, i0...index, s0)
+      r0.extend(ScenarioKeyword0)
     else
-      terminal_parse_failure('Scenario:')
+      self.index = i0
       r0 = nil
     end
 
@@ -1193,6 +1486,54 @@ module Feature #:nodoc:
     return r0
   end
 
+  module MoreExamplesKeyword0 #:nodoc:
+  end
+
+  def _nt_more_examples_keyword #:nodoc:
+    start_index = index
+    if node_cache[:more_examples_keyword].has_key?(index)
+      cached = node_cache[:more_examples_keyword][index]
+      @index = cached.interval.end if cached
+      return cached
+    end
+
+    i0, s0 = index, []
+    if input.index("More Examples", index) == index
+      r1 = (SyntaxNode).new(input, index...(index + 13))
+      @index += 13
+    else
+      terminal_parse_failure("More Examples")
+      r1 = nil
+    end
+    s0 << r1
+    if r1
+      if input.index(":", index) == index
+        r3 = (SyntaxNode).new(input, index...(index + 1))
+        @index += 1
+      else
+        terminal_parse_failure(":")
+        r3 = nil
+      end
+      if r3
+        r2 = r3
+      else
+        r2 = SyntaxNode.new(input, index...index)
+      end
+      s0 << r2
+    end
+    if s0.last
+      r0 = (SyntaxNode).new(input, i0...index, s0)
+      r0.extend(MoreExamplesKeyword0)
+    else
+      self.index = i0
+      r0 = nil
+    end
+
+    node_cache[:more_examples_keyword][start_index] = r0
+
+    return r0
+  end
+
   module GivenScenarioKeyword0 #:nodoc:
   end
 
@@ -1205,20 +1546,20 @@ module Feature #:nodoc:
     end
 
     i0, s0 = index, []
-    if input.index('GittScenario', index) == index
-      r1 = (SyntaxNode).new(input, index...(index + 12))
-      @index += 12
+    if input.index("GivetScenario", index) == index
+      r1 = (SyntaxNode).new(input, index...(index + 13))
+      @index += 13
     else
-      terminal_parse_failure('GittScenario')
+      terminal_parse_failure("GivetScenario")
       r1 = nil
     end
     s0 << r1
     if r1
-      if input.index(':', index) == index
+      if input.index(":", index) == index
         r3 = (SyntaxNode).new(input, index...(index + 1))
         @index += 1
       else
-        terminal_parse_failure(':')
+        terminal_parse_failure(":")
         r3 = nil
       end
       if r3