Revert keyword arguments in ast classes. Fix remaining issues.

Revert back to using the ast_builder to be able to distribute the
language and comments from the feature down the tree before the ast
classes are created.

lib/cucumber/core/ast/background.rb

@@ -10,9 +10,7 @@ class Background
         include HasLocation
         include DescribesItself
 
-        def initialize(gherkin_statement, language, location, comments, keyword, name, description, raw_steps)
-          @gherkin_statement = gherkin_statement
-          @language = language
+        def initialize(location, comments, keyword, name, description, raw_steps)
           @location = location
           @comments = comments
           @keyword = keyword
@@ -21,11 +19,10 @@ def initialize(gherkin_statement, language, location, comments, keyword, name, d
           @raw_steps = raw_steps
         end
 
-        attr_reader :language, :description, :raw_steps
-        private     :language, :raw_steps
+        attr_reader :description, :raw_steps
+        private     :raw_steps
 
         attr_reader :comments, :keyword, :location
-        attr_reader :gherkin_statement
 
         def children
           raw_steps

lib/cucumber/core/ast/data_table.rb

@@ -32,7 +32,7 @@ class DataTable
         # You don't typically create your own DataTable objects - Cucumber will do
         # it internally and pass them to your Step Definitions.
         #
-        def initialize(rows:, location:)
+        def initialize(rows, location)
           raw = ensure_array_of_array(rows)
           verify_rows_are_same_length(raw)
           @raw = raw.freeze

lib/cucumber/core/ast/doc_string.rb

@@ -25,7 +25,7 @@ class DocString < SimpleDelegator
 
         attr_reader :content_type, :content
 
-        def initialize(content:nil, content_type:nil, location: nil)
+        def initialize(content, content_type, location)
           @content = content
           @content_type = content_type
           @location = location

lib/cucumber/core/ast/examples_table.rb

@@ -11,8 +11,9 @@ class ExamplesTable
         include HasLocation
         include DescribesItself
 
-        def initialize(location:, tags:, keyword:, name:, description: "", header:, example_rows:)
+        def initialize(location, comments, tags, keyword, name, description, header, example_rows)
           @location = location
+          @comments = comments
           @tags = tags
           @keyword = keyword
           @name = name
@@ -21,7 +22,7 @@ def initialize(location:, tags:, keyword:, name:, description: "", header:, exam
           @example_rows = example_rows
         end
 
-        attr_reader :location, :tags, :keyword,
+        attr_reader :location, :tags, :keyword, :comments,
                     :header, :example_rows
 
         private

lib/cucumber/core/ast/feature.rb

@@ -1,6 +1,7 @@
 require 'cucumber/core/ast/describes_itself'
 require 'cucumber/core/ast/names'
 require 'cucumber/core/ast/location'
+require 'gherkin3/dialect'
 
 module Cucumber
   module Core
@@ -15,7 +16,7 @@ class Feature
                     :comments, :tags, :keyword, :description,
                     :feature_elements
 
-        def initialize(language:, location:, background: EmptyBackground.new, comments:, tags:, keyword:, name:, description: "", scenario_definitions:)
+        def initialize(language, location, background, comments, tags, keyword, name, description, scenario_definitions)
           @language = language
           @location = location
           @background = background
@@ -33,7 +34,7 @@ def children
 
         def short_name
           first_line = name.split(/\n/)[0]
-          if first_line =~ /#{language.keywords('feature')}:(.*)/
+          if first_line =~ /#{language.feature}:(.*)/
             $1.strip
           else
             first_line
@@ -64,6 +65,15 @@ def method_missing(*args, &block)
           self
         end
       end
+
+      class LanguageDelegator < SimpleDelegator
+        attr_reader :iso_code
+
+        def initialize(iso_code, obj)
+          super(obj)
+          @iso_code = iso_code
+        end
+      end
     end
   end
 end

lib/cucumber/core/ast/location.rb

@@ -63,9 +63,6 @@ class Lines < Struct.new(:data)
           attr_reader :line
 
           def initialize(raw_data)
-            if Cucumber::JRUBY && raw_data.is_a?(::Java::GherkinFormatterModel::Range)
-              raw_data = Range.new(raw_data.first, raw_data.last)
-            end
             super Array(raw_data).to_set
             @line = data.first
           end

lib/cucumber/core/ast/outline_step.rb

@@ -12,12 +12,12 @@ class OutlineStep
 
         attr_reader :language, :location, :comments, :keyword, :name, :multiline_arg
 
-        def initialize(language, location, comments, keyword, name, multiline_arg)
-          @language, @location, @comments, @keyword, @name, @multiline_arg = language, location, comments, keyword, name, multiline_arg
+        def initialize(language, location, comments, keyword, text, multiline_arg)
+          @language, @location, @comments, @keyword, @name, @multiline_arg = language, location, comments, keyword, text, multiline_arg
         end
 
         def to_step(row)
-          Ast::ExpandedOutlineStep.new(self, gherkin_statement, language, row.location, comments, keyword, row.expand(name), replace_multiline_arg(row))
+          Ast::ExpandedOutlineStep.new(self, language, row.location, comments, keyword, row.expand(name), replace_multiline_arg(row))
         end
 
         def inspect

lib/cucumber/core/ast/scenario.rb

@@ -11,14 +11,14 @@ class Scenario
         include HasLocation
         include DescribesItself
 
-        attr_reader :language, :location, :background,
-                    :tags, :keyword,
+        attr_reader :location, :background,
+                    :comments, :tags, :keyword,
                     :description, :raw_steps
         private :raw_steps
 
-        def initialize(language: "TODO", location:, tags:, keyword:, name:, description: "", steps:)
-          @language          = language
+        def initialize(location, comments, tags, keyword, name, description, steps)
           @location          = location
+          @comments          = comments
           @tags              = tags
           @keyword           = keyword
           @name              = name

lib/cucumber/core/ast/scenario_outline.rb

@@ -12,13 +12,13 @@ class ScenarioOutline
 
         MissingExamples = Class.new(StandardError)
 
-        attr_reader :language, :tags, :keyword,
+        attr_reader :comments, :tags, :keyword,
                     :steps, :examples_tables, :line
-        private :language, :line
+        private :line
 
-        def initialize(language: "TODO", location:, tags:, keyword:, name:, description: "", steps:, examples:)
-          @language          = language
+        def initialize(location, comments, tags, keyword, name, description, steps, examples)
           @location          = location
+          @comments          = comments
           @tags              = tags
           @keyword           = keyword
           @name              = name

lib/cucumber/core/ast/step.rb

@@ -23,9 +23,9 @@ def backtrace_line
         end
 
         def actual_keyword(previous_step_keyword = nil)
-          if [language.keywords('and'), language.keywords('but')].flatten.uniq.include? keyword
+          if [language.and, language.but].flatten.uniq.include? keyword
             if previous_step_keyword.nil?
-              language.keywords('given').reject{|kw| kw == '* '}[0]
+              language.given.reject{|kw| kw == '* '}[0]
             else
               previous_step_keyword
             end
@@ -52,14 +52,15 @@ def description_for_visitors
 
       class ExpandedOutlineStep < Step
 
-        def initialize(outline_step, gherkin_statement, language, location, comments, keyword, name, multiline_arg)
-          @outline_step, @gherkin_statement, @language, @location, @comments, @keyword, @name, @multiline_arg = outline_step, gherkin_statement, language, location, comments, keyword, name, multiline_arg
+        def initialize(outline_step, language, location, comments, keyword, name, multiline_arg)
+          @outline_step, @language, @location, @comments, @keyword, @name, @multiline_arg = outline_step, language, location, comments, keyword, name, multiline_arg
         end
 
         alias :self_match_locations? :match_locations?
 
         def match_locations?(queried_locations)
-          self_match_locations?(queried_locations) or @outline_step.match_locations?(queried_locations)
+          return true if self_match_locations?(queried_locations) 
+          @outline_step.match_locations?(queried_locations)
         end
 
         alias :step_backtrace_line :backtrace_line