gherkin 1.0.5-java → 1.0.6-java

data/.gitignore

@@ -5,3 +5,4 @@ rdoc
 pkg
 ext
 tmp
+release

data/History.txt

@@ -1,4 +1,15 @@
-== 1.0.5 (2009-04-08)
+== 1.0.6 (2010-04-10)
+
+=== New Features
+* Fully automated release process. (Aslak Hellesøy)
+
+=== Changed Features
+* Made generated classes use a more uniform naming convention. (Aslak Hellesøy)
+
+=== Removed Features
+* Removed C# port, obsoleted by IKVM build from 1.0.5. (Aslak Hellesøy)
+
+== 1.0.5 (2010-04-08)
 
 === New Features
 * New .NET build of gherkin - an ikvmc build of gherkin.jar to gherkin.dll. (Aslak Hellesøy)
@@ -6,7 +17,7 @@
 === Bugfixes
 * Made parsers reusable so that the same instance can parse several features. (Aslak Hellesøy)
 
-== 1.0.4 (2009-04-07)
+== 1.0.4 (2010-04-07)
 
 === New features
 * Pure java releases of Gherkin at http://cukes.info/maven
@@ -15,7 +26,7 @@
 === Changed features
 * The Lexer now emits the '@' for tags. (Aslak Hellesøy)
 
-== 1.0.3 (2009-03-31)
+== 1.0.3 (2010-03-31)
 
 === Bugfixes
 * The C lexer correctly instantiates a new array for each table, instead of reusing the old one. (Aslak Hellesøy)

data/README.rdoc

@@ -28,21 +28,10 @@ E.g. in Bash, export RL_LANG="en,fr,no". This can be quite helpful when modifyin
 
 == Release process
 
-* Bump version in the VERSION file
-* Do a file search and replace from old version number to new one.
-* Run "rake clean spec cucumber" for each platform (1.8.6, 1.8.7, 1.9, jruby) to make sure all is green.
-* rvm 1.8.7
-* rake clean jar compile
-* rake gemspec
-* git commit -a -m "Release vX.Y.Z"
-* rake gemcutter:release
-* rake git:release
-* ./nativegems.sh
-* gem push pkg/... (for each native gem)
-* cd java && mvn deploy
-* rake ikvm
-* Upload pkg/gherkin-X.Y.Z.dll to Github: http://github.com/aslakhellesoy/gherkin/downloads
-
+* Bump version in the VERSION.yml file and:
+** java/pom.xml
+** ikvm/Gherkin/Gherkin,csproj
+* rake release:ALL
 * Announce on Cucumber list, IRC and Twitter.
 
 == Configuring Rake-Compiler for cross compilation

data/Rakefile

@@ -22,9 +22,7 @@ begin
     gem.add_development_dependency "rspec", ">= 1.3.0"
     gem.add_development_dependency "cucumber", ">= 0.6.4"
     gem.add_development_dependency "rake-compiler", ">= 0.7.0" unless defined?(JRUBY_VERSION)
-    gem.add_development_dependency "albacore", ">= 0.1.2"
     
-    gem.files -= FileList['dotnet/**/*']
     gem.files -= FileList['ikvm/**/*']
     gem.files -= FileList['java/**/*']
     case ENV['PLATFORM']

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 0
-:patch: 5
+:patch: 6
 :major: 1

data/lib/gherkin/c_lexer.rb

@@ -1,10 +1,8 @@
 module Gherkin
   module CLexer
-    def self.[](i18n_language_name)
-      name = i18n_language_name.gsub(/[\s-]/, '')
-      require "gherkin_lexer_#{name}"
-      i18n_lexer_class_name = name.capitalize
-      const_get(i18n_lexer_class_name)
+    def self.[](i18n_sanitized_key)
+      require "gherkin_lexer_#{i18n_sanitized_key}"
+      const_get(i18n_sanitized_key.capitalize)
     end
   end
 end

data/lib/gherkin/i18n.rb

@@ -65,16 +65,16 @@ module Gherkin
 
     def c(listener)
       require 'gherkin/c_lexer'
-      CLexer[@key].new(listener)
+      CLexer[sanitized_key].new(listener)
     end
 
     def rb(listener)
       require 'gherkin/rb_lexer'
-      RbLexer[@key].new(listener)
+      RbLexer[sanitized_key].new(listener)
     end
 
     def sanitized_key
-      @key.gsub(/[\s-]/, '')
+      @key.gsub(/[\s-]/, '_').downcase
     end
 
     def incomplete?

data/lib/gherkin/i18n.yml

@@ -495,6 +495,19 @@
   then: "*|O zaman"
   and: "*|Ve"
   but: "*|Fakat|Ama"
+"uk":
+  name: Ukrainian
+  native: Українська
+  feature: Функціонал
+  background: Передумова
+  scenario: Сценарій
+  scenario_outline: Структура сценарію
+  examples: Приклади
+  given: "*|Припустимо|Припустимо, що|Нехай"
+  when: "*|Якщо"
+  then: "*|То"
+  and: "*|І"
+  but: "*|Але"
 "uz":
   name: Uzbek
   native: Узбекча

data/lib/gherkin/rb_lexer.rb

@@ -1,10 +1,8 @@
 module Gherkin
   module RbLexer
-    def self.[](i18n_language_name)
-      name = i18n_language_name.gsub(/[\s-]/, '')
-      require "gherkin/rb_lexer/#{name}"
-      i18n_lexer_class_name = name.capitalize
-      const_get(i18n_lexer_class_name)
+    def self.[](i18n_sanitized_key)
+      require "gherkin/rb_lexer/#{i18n_sanitized_key}"
+      const_get(i18n_sanitized_key.capitalize)
     end
   end
 end

data/ragel/lexer.java.rl.erb

@@ -8,7 +8,7 @@ import gherkin.Lexer;
 import gherkin.Listener;
 import gherkin.LexingError;
 
-public class <%= @i18n.sanitized_key.capitalize %> implements Lexer {
+public class <%= @i18n.sanitized_key.upcase %> implements Lexer {
   %%{
     machine lexer;
     alphtype byte;
@@ -134,7 +134,7 @@ public class <%= @i18n.sanitized_key.capitalize %> implements Lexer {
 
   private final Listener listener;
 
-  public <%= @i18n.sanitized_key.capitalize %>(Listener listener) {
+  public <%= @i18n.sanitized_key.upcase %>(Listener listener) {
     this.listener = listener;
   }
 

data/tasks/compile.rake

@@ -8,10 +8,7 @@ CLEAN.include [
   'ragel/i18n/*.rl',
   'lib/gherkin/rb_lexer/*.rb',
   'ext/**/*.c',
-  'java/src/gherkin/lexer/*.java',
-  'dotnet/Gherkin/Lexer',
-  'dotnet/Gherkin/obj',
-  'dotnet/Gherkin/bin'
+  'java/src/main/java/gherkin/lexer/*.java'
 ]
 
 desc "Compile the Java extensions"
@@ -21,83 +18,14 @@ file 'lib/gherkin.jar' => Dir['java/src/main/java/**/*.java'] do
   sh("mvn -f java/pom.xml package")
 end
 
-namespace :dotnet do
-  require 'albacore'
-
-  FileList['lib/gherkin/parser/*'].each do |src|
-    dst = "dotnet/Gherkin/StateMachine/#{File.basename(src)}"
-    file dst => src do
-      cp src, dst, :verbose => true    
-    end
-    task :compile => dst
-  end
-
-  task :compile => :lexer
-
-  if (`which mono` rescue "") =~ /mono/
-    xbuild :compile do |msb|
-      msb.properties :configuration => :Release
-      msb.targets :Build
-      msb.solution = 'dotnet/Gherkin.sln'
-    end
-
-    require 'rake/xunittask'
-    class XUnitTestRunner
-      def execute
-        system("mono dotnet/lib/xunit/xunit.console.exe dotnet/Gherkin.Tests/bin/Release/Gherkin.Tests.dll")
-        exit 1 if $? != 0
-      end
-    end
-  else
-    msbuild :compile do |msb|
-      msb.properties :configuration => :Release
-      msb.targets :Build
-      msb.solution = 'dotnet/Gherkin.sln'
-    end
-  end
-
-  xunit :test => :compile do |xunit|
-    xunit.path_to_command = "dotnet/lib/xunit/xunit.console.exe"
-    xunit.assembly = "dotnet/Gherkin.Tests/bin/Release/Gherkin.Tests.dll"
-  end
-
-  task :package => :test do
-    cp 'dotnet/Gherkin/bin/Release/Gherkin.dll', 'lib/Gherkin.dll'
-  end
-end
-
-desc "Compile and package the .NET extensions"
-task :dotnet => ['dotnet:package']
-
-class CSharpSByteFixTask
-  def initialize(source)
-    @source = source
-    define_tasks
-  end
-
-  def define_tasks
-    directory File.dirname(target)
-    file target => [File.dirname(target), @source] do
-      sh "cat #{@source} | sed ""s/sbyte/short/g"" > #{target}"
-    end
-  end
-
-  def target
-    "dotnet/Gherkin/Lexer/#{File.basename(@source)}"
-  end
-end
-
 rl_langs = ENV['RL_LANGS'] ? ENV['RL_LANGS'].split(',') : []
 langs = Gherkin::I18n.all.select { |lang| rl_langs.empty? || rl_langs.include?(lang.key) }
 
 langs.each do |i18n|
   java       = RagelTask.new('java', i18n)
   rb         = RagelTask.new('rb', i18n)
-  csharp_tmp = RagelTask.new('csharp', i18n)
-  csharp     = CSharpSByteFixTask.new(csharp_tmp.target)
 
-  task :jar             => [java.target, rb.target]
-  task 'dotnet:lexer'   => csharp.target
+  file 'lib/gherkin.jar' => [java.target, rb.target]
 
   begin
   unless defined?(JRUBY_VERSION)

data/tasks/gems.rake

@@ -0,0 +1,31 @@
+namespace :gems do
+  desc 'Release JRuby gem'
+  task :jruby => :release_dir do
+    sh "rvm jruby rake clean spec gemspec build PLATFORM=java"
+    mv "pkg/gherkin-#{GHERKIN_VERSION}-java.gem", 'release'
+  end
+
+  desc "Release MRI/C POSIX gem"
+  task :posix => :release_dir  do
+    sh "rvm 1.8.7 rake clean spec gemspec build"
+    mv "pkg/gherkin-#{GHERKIN_VERSION}.gem", 'release'
+  end
+
+  [:mswin32, :mingw32].each do |win_compiler|
+    desc "Release MRI/C precompiled #{win_compiler} gem"
+    task win_compiler => :posix do
+      sh "rvm 1.8.7 rake cross compile gemspec build PLATFORM=i386-#{win_compiler} RUBY_CC_VERSION=1.8.6"
+      mv "pkg/gherkin-#{GHERKIN_VERSION}-x86-#{win_compiler}.gem", 'release'
+    end
+  end
+
+  task :release_dir do
+    mkdir 'release' unless File.directory?('release')
+  end
+
+  task :clean_release_dir do
+    rm_rf 'release' if File.directory?('release')
+  end
+end
+
+task :gems => ['gems:clean_release_dir', 'gems:jruby', 'gems:posix', 'gems:mswin32', 'gems:mingw32']

data/tasks/ikvm.rake

@@ -26,19 +26,19 @@ namespace :ikvm do
   task :dll => 'pkg/gherkin.dll'
 
   file 'pkg/gherkin.exe' => 'lib/gherkin.jar' do
-    mkdir_p 'pkg' unless File.directory?('pkg')
-    sh("mono /usr/local/ikvm/bin/ikvmc.exe -target:exe lib/gherkin.jar -out:pkg/gherkin-#{GHERKIN_VERSION}.exe")
+    mkdir_p 'release' unless File.directory?('release')
+    sh("mono /usr/local/ikvm/bin/ikvmc.exe -target:exe lib/gherkin.jar -out:release/gherkin-#{GHERKIN_VERSION}.exe")
   end
 
   file 'pkg/gherkin.dll' => 'lib/gherkin.jar' do
-    mkdir_p 'pkg' unless File.directory?('pkg')
-    sh("mono /usr/local/ikvm/bin/ikvmc.exe -target:library lib/gherkin.jar -out:pkg/gherkin-#{GHERKIN_VERSION}.dll")
+    mkdir_p 'release' unless File.directory?('release')
+    sh("mono /usr/local/ikvm/bin/ikvmc.exe -target:library lib/gherkin.jar -out:release/gherkin-#{GHERKIN_VERSION}.dll")
   end
 
   desc 'Copy the IKVM .dll files over to the pkg dir'
   task :copy_ikvm_dlls do
     Dir['/usr/local/ikvm/bin/{IKVM.OpenJDK.Core,IKVM.OpenJDK.Text,IKVM.Runtime}.dll'].each do |dll|
-      cp dll, 'pkg'
+      cp dll, 'release'
     end
   end
 end

data/tasks/ragel_task.rb

@@ -28,7 +28,7 @@ class RagelTask
   def target
     {
       'c'    => "ext/gherkin_lexer_#{@i18n.sanitized_key}/gherkin_lexer_#{@i18n.sanitized_key}.c",
-      'java' => "java/src/main/java/gherkin/lexer/#{@i18n.sanitized_key.capitalize}.java",
+      'java' => "java/src/main/java/gherkin/lexer/#{@i18n.sanitized_key.upcase}.java",
       'rb'   => "lib/gherkin/rb_lexer/#{@i18n.sanitized_key}.rb",
       'csharp'   => "tmp/#{@i18n.sanitized_key}.cs"
     }[@lang]

data/tasks/release.rake

@@ -0,0 +1,26 @@
+namespace :release do
+  desc 'Uplad all packages and tag git'
+  task :ALL => [:_gems, :dll, :jar, 'git:release']
+
+  task :_gems => :gems do
+    Dir.chdir('release') do
+      Dir['*.gem'].each do |gem_file|
+        sh("gem push #{gem_file}")
+      end
+    end
+  end
+
+  task :dll => :ikvm do
+    Dir.chdir('release') do
+      # This requires aslakhellesoy's build of the github gem,
+      # which has tekkub's upload command.
+      sh("github upload #{Dir['gherkin*.dll'][0]}")
+    end
+  end
+
+  task :jar do
+    Dir.chdir('java') do
+      sh("mvn deploy")
+    end
+  end
+end

metadata

@@ -1,247 +1,199 @@
 --- !ruby/object:Gem::Specification 
 name: gherkin
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 5
-  version: 1.0.5
+  version: 1.0.6
 platform: java
 authors: 
-- Mike Sassak
-- Gregory Hnatiuk
-- "Aslak Helles\xC3\xB8y"
+  - Mike Sassak
+  - Gregory Hnatiuk
+  - "Aslak Helles\xC3\xB8y"
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-04-08 00:00:00 +02:00
+date: 2010-04-10 00:00:00 +02:00
 default_executable: gherkin
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: trollop
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 15
-        version: "1.15"
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 0
-        version: 1.3.0
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: cucumber
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        - 4
-        version: 0.6.4
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake-compiler
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 7
-        - 0
-        version: 0.7.0
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: albacore
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        - 2
-        version: 0.1.2
-  type: :development
-  version_requirements: *id005
+  - !ruby/object:Gem::Dependency 
+    name: trollop
+    type: :runtime
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "1.15"
+      version: 
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    type: :development
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 1.3.0
+      version: 
+  - !ruby/object:Gem::Dependency 
+    name: cucumber
+    type: :development
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 0.6.4
+      version: 
 description: A fast Gherkin lexer/parser based on the Ragel State Machine Compiler.
 email: cukes@googlegroups.com
 executables: 
-- gherkin
+  - gherkin
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+  - LICENSE
+  - README.rdoc
 files: 
-- .gitattributes
-- .gitignore
-- .mailmap
-- History.txt
-- LICENSE
-- README.rdoc
-- Rakefile
-- VERSION.yml
-- bin/gherkin
-- cucumber.yml
-- dotnet/.gitignore
-- features/feature_parser.feature
-- features/native_lexer.feature
-- features/parser_with_native_lexer.feature
-- features/pretty_printer.feature
-- features/step_definitions/gherkin_steps.rb
-- features/step_definitions/pretty_listener_step.rb
-- features/steps_parser.feature
-- features/support/env.rb
-- gherkin.gemspec
-- ikvm/.gitignore
-- java/.gitignore
-- java/Gherkin.iml
-- java/src/main/java/gherkin/lexer/.gitignore
-- lib/.gitignore
-- lib/gherkin.jar
-- lib/gherkin.rb
-- lib/gherkin/c_lexer.rb
-- lib/gherkin/cli/main.rb
-- lib/gherkin/core_ext/array.rb
-- lib/gherkin/csharp_lexer.rb
-- lib/gherkin/formatter/argument.rb
-- lib/gherkin/formatter/colors.rb
-- lib/gherkin/formatter/monochrome_format.rb
-- lib/gherkin/formatter/pretty_listener.rb
-- lib/gherkin/i18n.rb
-- lib/gherkin/i18n.yml
-- lib/gherkin/i18n_lexer.rb
-- lib/gherkin/parser/filter_listener.rb
-- lib/gherkin/parser/meta.txt
-- lib/gherkin/parser/parser.rb
-- lib/gherkin/parser/root.txt
-- lib/gherkin/parser/sexp.rb
-- lib/gherkin/parser/steps.txt
-- lib/gherkin/parser/tag_expression.rb
-- lib/gherkin/rb_lexer.rb
-- lib/gherkin/rb_lexer/.gitignore
-- lib/gherkin/rb_lexer/README.rdoc
-- lib/gherkin/tools.rb
-- lib/gherkin/tools/files.rb
-- lib/gherkin/tools/reformat.rb
-- lib/gherkin/tools/stats.rb
-- lib/gherkin/tools/stats_listener.rb
-- nativegems.sh
-- ragel/i18n/.gitignore
-- ragel/lexer.c.rl.erb
-- ragel/lexer.csharp.rl.erb
-- ragel/lexer.java.rl.erb
-- ragel/lexer.rb.rl.erb
-- ragel/lexer_common.rl.erb
-- spec/gherkin/c_lexer_spec.rb
-- spec/gherkin/csharp_lexer_spec.rb
-- spec/gherkin/fixtures/1.feature
-- spec/gherkin/fixtures/comments_in_table.feature
-- spec/gherkin/fixtures/complex.feature
-- spec/gherkin/fixtures/dos_line_endings.feature
-- spec/gherkin/fixtures/i18n_fr.feature
-- spec/gherkin/fixtures/i18n_no.feature
-- spec/gherkin/fixtures/i18n_zh-CN.feature
-- spec/gherkin/fixtures/simple.feature
-- spec/gherkin/fixtures/simple_with_comments.feature
-- spec/gherkin/fixtures/simple_with_tags.feature
-- spec/gherkin/formatter/argument_spec.rb
-- spec/gherkin/formatter/colors_spec.rb
-- spec/gherkin/formatter/pretty_listener_spec.rb
-- spec/gherkin/i18n_lexer_spec.rb
-- spec/gherkin/i18n_spec.rb
-- spec/gherkin/java_lexer_spec.rb
-- spec/gherkin/parser/filter_listener_spec.rb
-- spec/gherkin/parser/parser_spec.rb
-- spec/gherkin/parser/tag_expression_spec.rb
-- spec/gherkin/rb_lexer_spec.rb
-- spec/gherkin/sexp_recorder.rb
-- spec/gherkin/shared/lexer_spec.rb
-- spec/gherkin/shared/py_string_spec.rb
-- spec/gherkin/shared/row_spec.rb
-- spec/gherkin/shared/tags_spec.rb
-- spec/spec_helper.rb
-- tasks/bench.rake
-- tasks/bench/feature_builder.rb
-- tasks/bench/generated/.gitignore
-- tasks/bench/null_listener.rb
-- tasks/compile.rake
-- tasks/cucumber.rake
-- tasks/ikvm.rake
-- tasks/ragel_task.rb
-- tasks/rdoc.rake
-- tasks/rspec.rake
+  - .gitattributes
+  - .gitignore
+  - .mailmap
+  - History.txt
+  - LICENSE
+  - README.rdoc
+  - Rakefile
+  - VERSION.yml
+  - bin/gherkin
+  - cucumber.yml
+  - features/feature_parser.feature
+  - features/native_lexer.feature
+  - features/parser_with_native_lexer.feature
+  - features/pretty_printer.feature
+  - features/step_definitions/gherkin_steps.rb
+  - features/step_definitions/pretty_listener_step.rb
+  - features/steps_parser.feature
+  - features/support/env.rb
+  - ikvm/.gitignore
+  - java/.gitignore
+  - java/src/main/java/gherkin/lexer/.gitignore
+  - lib/.gitignore
+  - lib/gherkin.jar
+  - lib/gherkin.rb
+  - lib/gherkin/c_lexer.rb
+  - lib/gherkin/cli/main.rb
+  - lib/gherkin/core_ext/array.rb
+  - lib/gherkin/csharp_lexer.rb
+  - lib/gherkin/formatter/argument.rb
+  - lib/gherkin/formatter/colors.rb
+  - lib/gherkin/formatter/monochrome_format.rb
+  - lib/gherkin/formatter/pretty_listener.rb
+  - lib/gherkin/i18n.rb
+  - lib/gherkin/i18n.yml
+  - lib/gherkin/i18n_lexer.rb
+  - lib/gherkin/parser/filter_listener.rb
+  - lib/gherkin/parser/meta.txt
+  - lib/gherkin/parser/parser.rb
+  - lib/gherkin/parser/root.txt
+  - lib/gherkin/parser/sexp.rb
+  - lib/gherkin/parser/steps.txt
+  - lib/gherkin/parser/tag_expression.rb
+  - lib/gherkin/rb_lexer.rb
+  - lib/gherkin/rb_lexer/.gitignore
+  - lib/gherkin/rb_lexer/README.rdoc
+  - lib/gherkin/tools.rb
+  - lib/gherkin/tools/files.rb
+  - lib/gherkin/tools/reformat.rb
+  - lib/gherkin/tools/stats.rb
+  - lib/gherkin/tools/stats_listener.rb
+  - nativegems.sh
+  - ragel/i18n/.gitignore
+  - ragel/lexer.c.rl.erb
+  - ragel/lexer.java.rl.erb
+  - ragel/lexer.rb.rl.erb
+  - ragel/lexer_common.rl.erb
+  - spec/gherkin/c_lexer_spec.rb
+  - spec/gherkin/csharp_lexer_spec.rb
+  - spec/gherkin/fixtures/1.feature
+  - spec/gherkin/fixtures/comments_in_table.feature
+  - spec/gherkin/fixtures/complex.feature
+  - spec/gherkin/fixtures/dos_line_endings.feature
+  - spec/gherkin/fixtures/i18n_fr.feature
+  - spec/gherkin/fixtures/i18n_no.feature
+  - spec/gherkin/fixtures/i18n_zh-CN.feature
+  - spec/gherkin/fixtures/simple.feature
+  - spec/gherkin/fixtures/simple_with_comments.feature
+  - spec/gherkin/fixtures/simple_with_tags.feature
+  - spec/gherkin/formatter/argument_spec.rb
+  - spec/gherkin/formatter/colors_spec.rb
+  - spec/gherkin/formatter/pretty_listener_spec.rb
+  - spec/gherkin/i18n_lexer_spec.rb
+  - spec/gherkin/i18n_spec.rb
+  - spec/gherkin/java_lexer_spec.rb
+  - spec/gherkin/parser/filter_listener_spec.rb
+  - spec/gherkin/parser/parser_spec.rb
+  - spec/gherkin/parser/tag_expression_spec.rb
+  - spec/gherkin/rb_lexer_spec.rb
+  - spec/gherkin/sexp_recorder.rb
+  - spec/gherkin/shared/lexer_spec.rb
+  - spec/gherkin/shared/py_string_spec.rb
+  - spec/gherkin/shared/row_spec.rb
+  - spec/gherkin/shared/tags_spec.rb
+  - spec/spec_helper.rb
+  - tasks/bench.rake
+  - tasks/bench/feature_builder.rb
+  - tasks/bench/generated/.gitignore
+  - tasks/bench/null_listener.rb
+  - tasks/compile.rake
+  - tasks/cucumber.rake
+  - tasks/gems.rake
+  - tasks/ikvm.rake
+  - tasks/ragel_task.rb
+  - tasks/rdoc.rake
+  - tasks/release.rake
+  - tasks/rspec.rake
 has_rdoc: true
 homepage: http://github.com/aslakhellesoy/gherkin
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --charset=UTF-8
+  - --charset=UTF-8
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Fast Gherkin lexer/parser
 test_files: 
-- spec/gherkin/c_lexer_spec.rb
-- spec/gherkin/csharp_lexer_spec.rb
-- spec/gherkin/formatter/argument_spec.rb
-- spec/gherkin/formatter/colors_spec.rb
-- spec/gherkin/formatter/pretty_listener_spec.rb
-- spec/gherkin/i18n_lexer_spec.rb
-- spec/gherkin/i18n_spec.rb
-- spec/gherkin/java_lexer_spec.rb
-- spec/gherkin/parser/filter_listener_spec.rb
-- spec/gherkin/parser/parser_spec.rb
-- spec/gherkin/parser/tag_expression_spec.rb
-- spec/gherkin/rb_lexer_spec.rb
-- spec/gherkin/sexp_recorder.rb
-- spec/gherkin/shared/lexer_spec.rb
-- spec/gherkin/shared/py_string_spec.rb
-- spec/gherkin/shared/row_spec.rb
-- spec/gherkin/shared/tags_spec.rb
-- spec/spec_helper.rb
+  - spec/spec_helper.rb
+  - spec/gherkin/c_lexer_spec.rb
+  - spec/gherkin/csharp_lexer_spec.rb
+  - spec/gherkin/i18n_lexer_spec.rb
+  - spec/gherkin/i18n_spec.rb
+  - spec/gherkin/java_lexer_spec.rb
+  - spec/gherkin/rb_lexer_spec.rb
+  - spec/gherkin/sexp_recorder.rb
+  - spec/gherkin/formatter/argument_spec.rb
+  - spec/gherkin/formatter/colors_spec.rb
+  - spec/gherkin/formatter/pretty_listener_spec.rb
+  - spec/gherkin/parser/filter_listener_spec.rb
+  - spec/gherkin/parser/parser_spec.rb
+  - spec/gherkin/parser/tag_expression_spec.rb
+  - spec/gherkin/shared/lexer_spec.rb
+  - spec/gherkin/shared/py_string_spec.rb
+  - spec/gherkin/shared/row_spec.rb
+  - spec/gherkin/shared/tags_spec.rb

data/dotnet/.gitignore

@@ -1,13 +0,0 @@
-*.user
-*.suo
-bin
-obj
-Gherkin/StateMachine/meta.txt
-Gherkin/StateMachine/root.txt
-Gherkin/StateMachine/steps.txt
-Gherkin/Lexer/*.cs
-*.sln.cache
-_ReSharper*
-Gherkin.sln.proj
-*.pidb
-*.userprefs

data/gherkin.gemspec

@@ -1,173 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{gherkin}
-  s.version = "1.0.5"
-  s.platform = %q{java}
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Mike Sassak", "Gregory Hnatiuk", "Aslak Helles\303\270y"]
-  s.date = %q{2010-04-08}
-  s.default_executable = %q{gherkin}
-  s.description = %q{A fast Gherkin lexer/parser based on the Ragel State Machine Compiler.}
-  s.email = %q{cukes@googlegroups.com}
-  s.executables = ["gherkin"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".gitattributes",
-     ".gitignore",
-     ".mailmap",
-     "History.txt",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION.yml",
-     "bin/gherkin",
-     "cucumber.yml",
-     "dotnet/.gitignore",
-     "features/feature_parser.feature",
-     "features/native_lexer.feature",
-     "features/parser_with_native_lexer.feature",
-     "features/pretty_printer.feature",
-     "features/step_definitions/gherkin_steps.rb",
-     "features/step_definitions/pretty_listener_step.rb",
-     "features/steps_parser.feature",
-     "features/support/env.rb",
-     "gherkin.gemspec",
-     "ikvm/.gitignore",
-     "java/.gitignore",
-     "java/Gherkin.iml",
-     "java/src/main/java/gherkin/lexer/.gitignore",
-     "lib/.gitignore",
-     "lib/gherkin.jar",
-     "lib/gherkin.rb",
-     "lib/gherkin/c_lexer.rb",
-     "lib/gherkin/cli/main.rb",
-     "lib/gherkin/core_ext/array.rb",
-     "lib/gherkin/csharp_lexer.rb",
-     "lib/gherkin/formatter/argument.rb",
-     "lib/gherkin/formatter/colors.rb",
-     "lib/gherkin/formatter/monochrome_format.rb",
-     "lib/gherkin/formatter/pretty_listener.rb",
-     "lib/gherkin/i18n.rb",
-     "lib/gherkin/i18n.yml",
-     "lib/gherkin/i18n_lexer.rb",
-     "lib/gherkin/parser/filter_listener.rb",
-     "lib/gherkin/parser/meta.txt",
-     "lib/gherkin/parser/parser.rb",
-     "lib/gherkin/parser/root.txt",
-     "lib/gherkin/parser/sexp.rb",
-     "lib/gherkin/parser/steps.txt",
-     "lib/gherkin/parser/tag_expression.rb",
-     "lib/gherkin/rb_lexer.rb",
-     "lib/gherkin/rb_lexer/.gitignore",
-     "lib/gherkin/rb_lexer/README.rdoc",
-     "lib/gherkin/tools.rb",
-     "lib/gherkin/tools/files.rb",
-     "lib/gherkin/tools/reformat.rb",
-     "lib/gherkin/tools/stats.rb",
-     "lib/gherkin/tools/stats_listener.rb",
-     "nativegems.sh",
-     "ragel/i18n/.gitignore",
-     "ragel/lexer.c.rl.erb",
-     "ragel/lexer.csharp.rl.erb",
-     "ragel/lexer.java.rl.erb",
-     "ragel/lexer.rb.rl.erb",
-     "ragel/lexer_common.rl.erb",
-     "spec/gherkin/c_lexer_spec.rb",
-     "spec/gherkin/csharp_lexer_spec.rb",
-     "spec/gherkin/fixtures/1.feature",
-     "spec/gherkin/fixtures/comments_in_table.feature",
-     "spec/gherkin/fixtures/complex.feature",
-     "spec/gherkin/fixtures/dos_line_endings.feature",
-     "spec/gherkin/fixtures/i18n_fr.feature",
-     "spec/gherkin/fixtures/i18n_no.feature",
-     "spec/gherkin/fixtures/i18n_zh-CN.feature",
-     "spec/gherkin/fixtures/simple.feature",
-     "spec/gherkin/fixtures/simple_with_comments.feature",
-     "spec/gherkin/fixtures/simple_with_tags.feature",
-     "spec/gherkin/formatter/argument_spec.rb",
-     "spec/gherkin/formatter/colors_spec.rb",
-     "spec/gherkin/formatter/pretty_listener_spec.rb",
-     "spec/gherkin/i18n_lexer_spec.rb",
-     "spec/gherkin/i18n_spec.rb",
-     "spec/gherkin/java_lexer_spec.rb",
-     "spec/gherkin/parser/filter_listener_spec.rb",
-     "spec/gherkin/parser/parser_spec.rb",
-     "spec/gherkin/parser/tag_expression_spec.rb",
-     "spec/gherkin/rb_lexer_spec.rb",
-     "spec/gherkin/sexp_recorder.rb",
-     "spec/gherkin/shared/lexer_spec.rb",
-     "spec/gherkin/shared/py_string_spec.rb",
-     "spec/gherkin/shared/row_spec.rb",
-     "spec/gherkin/shared/tags_spec.rb",
-     "spec/spec_helper.rb",
-     "tasks/bench.rake",
-     "tasks/bench/feature_builder.rb",
-     "tasks/bench/generated/.gitignore",
-     "tasks/bench/null_listener.rb",
-     "tasks/compile.rake",
-     "tasks/cucumber.rake",
-     "tasks/ikvm.rake",
-     "tasks/ragel_task.rb",
-     "tasks/rdoc.rake",
-     "tasks/rspec.rake"
-  ]
-  s.homepage = %q{http://github.com/aslakhellesoy/gherkin}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Fast Gherkin lexer/parser}
-  s.test_files = [
-    "spec/gherkin/c_lexer_spec.rb",
-     "spec/gherkin/csharp_lexer_spec.rb",
-     "spec/gherkin/formatter/argument_spec.rb",
-     "spec/gherkin/formatter/colors_spec.rb",
-     "spec/gherkin/formatter/pretty_listener_spec.rb",
-     "spec/gherkin/i18n_lexer_spec.rb",
-     "spec/gherkin/i18n_spec.rb",
-     "spec/gherkin/java_lexer_spec.rb",
-     "spec/gherkin/parser/filter_listener_spec.rb",
-     "spec/gherkin/parser/parser_spec.rb",
-     "spec/gherkin/parser/tag_expression_spec.rb",
-     "spec/gherkin/rb_lexer_spec.rb",
-     "spec/gherkin/sexp_recorder.rb",
-     "spec/gherkin/shared/lexer_spec.rb",
-     "spec/gherkin/shared/py_string_spec.rb",
-     "spec/gherkin/shared/row_spec.rb",
-     "spec/gherkin/shared/tags_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<trollop>, [">= 1.15"])
-      s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
-      s.add_development_dependency(%q<cucumber>, [">= 0.6.4"])
-      s.add_development_dependency(%q<rake-compiler>, [">= 0.7.0"])
-      s.add_development_dependency(%q<albacore>, [">= 0.1.2"])
-    else
-      s.add_dependency(%q<trollop>, [">= 1.15"])
-      s.add_dependency(%q<rspec>, [">= 1.3.0"])
-      s.add_dependency(%q<cucumber>, [">= 0.6.4"])
-      s.add_dependency(%q<rake-compiler>, [">= 0.7.0"])
-      s.add_dependency(%q<albacore>, [">= 0.1.2"])
-    end
-  else
-    s.add_dependency(%q<trollop>, [">= 1.15"])
-    s.add_dependency(%q<rspec>, [">= 1.3.0"])
-    s.add_dependency(%q<cucumber>, [">= 0.6.4"])
-    s.add_dependency(%q<rake-compiler>, [">= 0.7.0"])
-    s.add_dependency(%q<albacore>, [">= 0.1.2"])
-  end
-end
-

data/java/Gherkin.iml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.1" level="project" />
-  </component>
-</module>
-

data/ragel/lexer.csharp.rl.erb

@@ -1,240 +0,0 @@
-namespace Gherkin.Lexer
-{
-	using System.Text;
-	using System.Text.RegularExpressions;
-	using System.IO;
-	using System.Collections.Generic;
-	using System.Linq;
-	
-	[Language("<%= @i18n.sanitized_key.downcase %>")]
-	public class <%= @i18n.sanitized_key.capitalize %> : ILexer {
-		%%{
-			machine lexer;
-			alphtype char;
-
-			action begin_content {
-				contentStart = p;
-				contentCol = p - lastNewline + 1;
-	            contentNewline = lastNewline;
-				currentLine = lineNumber;
-			}
-
-			action start_pystring {
-				currentLine = lineNumber;
-				pystringStartCol = p - lastNewline;
-				pystringStartNewline = lastNewline;
-			}
-		    
-			action begin_pystring_content {
-				contentStart = p;
-			}
-
-			action store_pystring_content {
-				string con = Unindent(pystringStartCol, new Regex("(\\r?\\n)?( )*\\Z").Replace(Substring(data, contentStart, nextKeywordStart-1), "", 1));
-				listener.PythonString(new Token(con, GetCharacterPosition(data, pystringStartNewline, currentLine, pystringStartCol+1)));
-			}
-
-			action store_feature_content {
-				string con = MultilineStrip(KeywordContent(data, p, eof, nextKeywordStart, contentStart).Trim());
-				listener.Feature(new Token(keyword, GetCharacterPosition(data, keywordNewline, currentLine, keywordCol)), new Token(con, GetCharacterPosition(data, contentNewline, currentLine, contentCol)));
-				if(nextKeywordStart != -1) p = nextKeywordStart - 1;
-				nextKeywordStart = -1;
-			}
-
-			action store_background_content {
-				string con = MultilineStrip(KeywordContent(data, p, eof, nextKeywordStart, contentStart));
-				listener.Background(new Token(keyword, GetCharacterPosition(data, keywordNewline, currentLine, keywordCol)), new Token(con, GetCharacterPosition(data, contentNewline, currentLine, contentCol)));
-				if(nextKeywordStart != -1) p = nextKeywordStart - 1;
-				nextKeywordStart = -1;
-			}
-
-			action store_scenario_content {
-				string con = MultilineStrip(KeywordContent(data, p, eof, nextKeywordStart, contentStart));
-				listener.Scenario(new Token(keyword, GetCharacterPosition(data, keywordNewline, currentLine, keywordCol)), new Token(con, GetCharacterPosition(data, contentNewline, currentLine, contentCol)));
-				if(nextKeywordStart != -1) p = nextKeywordStart - 1;
-				nextKeywordStart = -1;
-			}
-
-			action store_scenario_outline_content {
-				string con = MultilineStrip(KeywordContent(data, p, eof, nextKeywordStart, contentStart));
-				listener.ScenarioOutline(new Token(keyword, GetCharacterPosition(data, keywordNewline, currentLine, keywordCol)), new Token(con, GetCharacterPosition(data, contentNewline, currentLine, contentCol)));
-				if(nextKeywordStart != -1) p = nextKeywordStart - 1;
-				nextKeywordStart = -1;
-			}
-
-			action store_examples_content {
-				string con = MultilineStrip(KeywordContent(data, p, eof, nextKeywordStart, contentStart));
-				listener.Examples(new Token(keyword, GetCharacterPosition(data, keywordNewline, currentLine, keywordCol)), new Token(con, GetCharacterPosition(data, contentNewline, currentLine, contentCol)));
-				if(nextKeywordStart != -1) p = nextKeywordStart - 1;
-				nextKeywordStart = -1;
-			}
-
-			action store_step_content {
-				listener.Step(
-					new Token(keyword, GetCharacterPosition(data, keywordNewline, currentLine, keywordCol)), 
-					new Token(Substring(data, contentStart, p).Trim(), GetCharacterPosition(data, contentNewline, currentLine, contentCol)),
-					LookupStepKind(keyword));
-			}
-
-			action store_comment_content {
-				listener.Comment(new Token(Substring(data, contentStart, p).Trim(), GetCharacterPosition(data, contentNewline, currentLine, contentCol)));
-				keywordStart = -1;
-			}
-
-			action store_tag_content {
-				listener.Tag(new Token(Substring(data, contentStart, p).Trim(), GetCharacterPosition(data, contentNewline, currentLine, contentCol-1)));
-				keywordStart = -1;
-			}
-
-			action inc_line_number {
-				lineNumber++;
-			}
-
-			action last_newline {
-				lastNewline = p + 1;
-			}
-
-			action start_keyword {
-				if(keywordStart == -1) keywordStart = p;
-				if(nextKeywordStart == -1)
-				{
-					keywordCol = p - lastNewline + 1;
-					keywordNewline = lastNewline;
-				}
-			}
-
-			action end_keyword {
-				keyword = new Regex(":$").Replace(Substring(data, keywordStart, p), "", 1);
-				keywordStart = -1;
-			}
-
-			action next_keyword_start {
-				nextKeywordStart = p;
-			}
-
-			action start_row {
-				p = p - 1;
-				contentCol = p - lastNewline + 1;
-				currentRow = new List<Token>();
-				currentLine = lineNumber;
-			}
-
-			action begin_cell_content {
-				contentStart = p;
-			}
-
-			action store_cell_content {
-				currentRow.Add(new Token(Substring(data, contentStart, p).Trim(), GetCharacterPosition(data, lastNewline, lineNumber, contentStart - lastNewline + 1)));
-			}
-
-			action store_row {
-				listener.Row(currentRow, GetCharacterPosition(data, contentNewline, currentLine, contentCol));
-			}
-
-			action end_feature {
-				if(cs < lexer_first_final) {
-					string content = CurrentLineContent(data, lastNewline);
-					throw new LexingException("Lexing error on line " + lineNumber + ": '" + content + "'");
-				} else {
-				  listener.Eof();
-				}
-			}
-
-			include lexer_common "lexer_common.<%= @i18n.sanitized_key %>.rl"; 
-		}%%
-
-		private readonly IListener listener;
-
-		private static readonly IDictionary<string, StepKind> stepKeywords = new Dictionary<string, StepKind>();
-
-		static <%= @i18n.sanitized_key.capitalize %>()
-		{
-			<% @i18n.keywords('given', true).reject{|kw| kw == '* '}.each do |keyword| %>
-			stepKeywords["<%=keyword%>"] = StepKind.Given;
-			<% end %>
-			<% @i18n.keywords('when', true).reject{|kw| kw == '* '}.each do |keyword| %>
-			stepKeywords["<%=keyword%>"] = StepKind.When;
-			<% end %>
-			<% @i18n.keywords('then', true).reject{|kw| kw == '* '}.each do |keyword| %>
-			stepKeywords["<%=keyword%>"] = StepKind.Then;
-			<% end %>
-			<% @i18n.keywords('and', true).reject{|kw| kw == '* '}.each do |keyword| %>
-			stepKeywords["<%=keyword%>"] = StepKind.And;
-			<% end %>
-			<% @i18n.keywords('but', true).reject{|kw| kw == '* '}.each do |keyword| %>
-			stepKeywords["<%=keyword%>"] = StepKind.But;
-			<% end %>
-			stepKeywords["* "] = StepKind.Any;
-		}
-
-		private static StepKind LookupStepKind(string keyword)
-		{
-			if (!stepKeywords.Keys.Contains(keyword))
-			   return StepKind.Unknown;
-			return stepKeywords[keyword];
-		}
-
-		public <%= @i18n.sanitized_key.capitalize %>(IListener listener) {
-			this.listener = listener;
-
-		}
-
-		%% write data noerror;
-
-		public void Scan(TextReader inputSequence) {
-			string input = inputSequence.ReadToEnd() + "\n%_FEATURE_END_%";
-			char[] data = Encoding.GetEncoding("iso-8859-1").GetChars(Encoding.UTF8.GetBytes(input));
-			int cs, p = 0, pe = data.Length;
-			int eof = pe;
-
-			int lineNumber = 1;
-			int lastNewline = 0;
-
-			int keywordCol = -1;
-		    int keywordNewline = 0;
-			int contentCol = -1;
-		    int contentNewline = 0;
-			int contentStart = -1;
-			int currentLine = -1;
-			int pystringStartNewline = 0;
-			int pystringStartCol = -1;
-			int nextKeywordStart = -1;
-			int keywordStart = -1;
-			string keyword = null;
-			IList<Token> currentRow = null;
-
-			%% write init;
-			%% write exec;
-		}
-
-		private string KeywordContent(char[] data, int p, int eof, int nextKeywordStart, int contentStart) {
-			int endPoint = (nextKeywordStart == -1 || (p == eof)) ? p : nextKeywordStart;
-			return Substring(data, contentStart, endPoint);
-		}
-
-		private string MultilineStrip(string text) {
-			var result = new StringBuilder();
-			foreach (var s in text.Split(new [] {'\n'})) {
-				result.AppendLine(s.Trim());
-			}
-			return result.ToString().Trim();
-		}
-
-		private string Unindent(int startCol, string text) {
-			return new Regex("^ {0," + startCol + "}", RegexOptions.Multiline).Replace(text, "");
-		}
-
-		private string CurrentLineContent(char[] data, int lastNewline) {
-			return Substring(data, lastNewline, data.Length).Trim();
-		}
-
-		private string Substring(char[] data, int start, int end) {
-			return Encoding.UTF8.GetString(Encoding.GetEncoding("iso-8859-1").GetBytes(data, start, end-start));
-		}
-		
-        private Position GetCharacterPosition(char[] data, int lineStart, int line, int bytecol) {
-            return new Position(line,
-                Encoding.UTF8.GetCharCount(Encoding.GetEncoding("iso-8859-1").GetBytes(data, lineStart, bytecol)));
-        }
-	}
-}