Ehuelsmann update perl

.circleci/config.yml

@@ -527,6 +527,19 @@ jobs:
             cd gherkin/c
             make
 
+### Perl
+
+  gherkin-perl:
+    executor: docker-cucumber-build
+    steps:
+      - attach_workspace:
+          at: "~/cucumber"
+      - run:
+          name: gherkin/perl
+          command: |
+            cd gherkin/perl
+            make
+
 ###
 ### Workflows ###
 ###
@@ -672,3 +685,7 @@ workflows:
       - gherkin-c:
           requires:
             - checkout
+
+      - gherkin-perl:
+          requires:
+            - checkout

gherkin/Makefile

@@ -1,2 +1,2 @@
-MAKEFILES = go/Makefile javascript/Makefile ruby/Makefile java/Makefile
-include default.mk
+MAKEFILES = go/Makefile javascript/Makefile ruby/Makefile java/Makefile perl/Makefile
+include default.mk

gherkin/perl/bin/gherkin-generate-ast

@@ -12,18 +12,13 @@ package App::GherkinGenerateAst;
 sub run {
     my ($class, $fh, @file_list) = @_;
 
-    my $json = Cpanel::JSON::XS->new->utf8->canonical;
+    my $json = Cpanel::JSON::XS->new->utf8->convert_blessed->canonical->pretty;
 
     my $parser = Gherkin::Parser->new();
 
     for my $file (@file_list) {
         my $gherkin_document = $parser->parse($file);
-        my $event = {
-            type => 'gherkin-document',
-            uri => $file,
-            document => $gherkin_document
-        };
-        print $fh $json->encode( $event );
+        print $fh $json->encode( $gherkin_document );
         print "\n"
     }
 

gherkin/perl/bin/gherkin-generate-pickles

@@ -1,34 +1,30 @@
 #!/usr/bin/env perl
 
+package App::GherkinGeneratePickles;
+
 use strict;
 use warnings;
 use lib 'lib';
 
 use Cpanel::JSON::XS;
+use Path::Class;
 
 use Gherkin::Parser;
 use Gherkin::Pickles::Compiler;
 
-package App::GherkinGeneratePickles;
-
 sub run {
     my ( $class, $fh, @file_list ) = @_;
-    my $json = Cpanel::JSON::XS->new->utf8->canonical;
+    my $json = Cpanel::JSON::XS->new->utf8->pretty->canonical;
 
     my $parser = Gherkin::Parser->new();
 
     for my $file (@file_list) {
+        my $source = file($file)->slurp;
         my $pickles = Gherkin::Pickles::Compiler->compile(
-            $parser->parse($file)
+            $parser->parse($file), $source
         );
         for my $pickle (@$pickles) {
-            my $event = {
-              type => 'pickle',
-              uri => $file,
-              pickle => $pickle
-            };
-            print $fh $json->encode($event);
-            print "\n"
+            print $fh $json->encode($pickle);
         }
     }
 }

gherkin/perl/bin/gherkin-generate-tokens

@@ -3,6 +3,7 @@
 use strict;
 use warnings;
 use lib 'lib';
+use utf8;
 
 use Gherkin::Parser;
 use Gherkin::TokenFormatterBuilder;
@@ -20,4 +21,5 @@ sub run {
 
 }
 
+binmode STDOUT, ':utf8';
 __PACKAGE__->run(\*STDOUT, @ARGV) unless caller;

gherkin/perl/gherkin-perl.razor

@@ -60,6 +60,8 @@ our %states_to_match_names = (
 
 sub parse {
     my ( $self, $token_scanner, $token_matcher ) = @@_;
+    my $additional = {};
+    $additional->{'uri'} = $token_scanner unless ref $token_scanner;
 
     $token_matcher ||= Gherkin::TokenMatcher->new();
     $token_scanner = Gherkin::TokenScanner->new($token_scanner)
@@ -87,7 +89,7 @@ sub parse {
         last if $token->is_eof();
     }
 
-    $self->_end_rule( $context, '@Model.RuleSet.StartRule.Name' );
+    $self->_end_rule( $context, '@Model.RuleSet.StartRule.Name', $additional );
 
     if ( my @@errors = $context->errors ) {
         Gherkin::Exceptions::CompositeParser->throw(@@errors);
@@ -109,7 +111,7 @@ sub match_@(rule.Name.Replace("#", "")) {
     my ($self, $context, $token) = @@_;
     @if (rule.Name != "#EOF")
     {
-    @: return if $token->is_eof;
+    @:return if $token->is_eof;
     }
     return $self->handle_external_error(
         $context,