Hello community, here is the log from the commit of package perl-YAML for openSUSE:Factory checked in at 2018-05-21 20:21:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-YAML (Old) and /work/SRC/openSUSE:Factory/.perl-YAML.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-YAML" Mon May 21 20:21:39 2018 rev:41 rq:610762 version:1.26 Changes: -------- --- /work/SRC/openSUSE:Factory/perl-YAML/perl-YAML.changes 2018-05-19 15:39:20.629482155 +0200 +++ /work/SRC/openSUSE:Factory/.perl-YAML.new/perl-YAML.changes 2018-05-21 20:21:41.827346623 +0200 @@ -1,0 +2,11 @@ +Sat May 19 06:05:39 UTC 2018 - [email protected] + +- updated to 1.26 + see /usr/share/doc/packages/perl-YAML/Changes + + 1.26 Fri May 18 21:57:20 CEST 2018 + - Fix bug introduced in 1.25 - loading of quoted string with colon as + sequence element (tinita, fixes issue#208) + - Support zero indented block sequences (PR#207 tinita) + +------------------------------------------------------------------- Old: ---- YAML-1.25.tar.gz New: ---- YAML-1.26.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-YAML.spec ++++++ --- /var/tmp/diff_new_pack.tgzaBm/_old 2018-05-21 20:21:42.939305809 +0200 +++ /var/tmp/diff_new_pack.tgzaBm/_new 2018-05-21 20:21:42.971304635 +0200 @@ -17,7 +17,7 @@ Name: perl-YAML -Version: 1.25 +Version: 1.26 Release: 0 %define cpan_name YAML Summary: YAML Ain't Markup Language™ ++++++ YAML-1.25.tar.gz -> YAML-1.26.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-1.25/Changes new/YAML-1.26/Changes --- old/YAML-1.25/Changes 2018-05-11 19:59:15.000000000 +0200 +++ new/YAML-1.26/Changes 2018-05-18 21:57:37.000000000 +0200 @@ -1,3 +1,8 @@ +1.26 Fri May 18 21:57:20 CEST 2018 + - Fix bug introduced in 1.25 - loading of quoted string with colon as + sequence element (tinita, fixes issue#208) + - Support zero indented block sequences (PR#207 tinita) + 1.25 Fri May 11 19:58:58 CEST 2018 - Applied several pull requests by tinita - Support trailing comments (PR#189, PR#190, PR#191) @@ -7,13 +12,13 @@ - Fix loading strings with multiple spaces (PR#172) - Allow more characters in anchor name (PR#196) - Add $YAML::LoadBlessed for disabling loading objects (PR#197) - - Applied several pull requests by tinita - Disable test with long string under certain conditions (PR#201) - Quote scalar if it equals '=' (PR#202) - Multiple regexp roundtrip does not grow (PR#203) - Add support for compact nested block sequences (PR#204) - Support reverse order of block scalar indicators (PR#205) - Support nested mappings in sequences (PR#206) + - Fix parsing of quoted strings (PR#188) 1.24 Mon Oct 30 20:31:53 CET 2017 - Fix $LoadCode (PR#180, PR#181, PR#182 by @mohawk2++) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-1.25/META.json new/YAML-1.26/META.json --- old/YAML-1.25/META.json 2018-05-11 19:59:15.000000000 +0200 +++ new/YAML-1.26/META.json 2018-05-18 21:57:37.000000000 +0200 @@ -58,7 +58,7 @@ "web" : "https://github.com/ingydotnet/yaml-pm"; } }, - "version" : "1.25", + "version" : "1.26", "x_serialization_backend" : "Cpanel::JSON::XS version 4.02" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-1.25/META.yml new/YAML-1.26/META.yml --- old/YAML-1.25/META.yml 2018-05-11 19:59:15.000000000 +0200 +++ new/YAML-1.26/META.yml 2018-05-18 21:57:37.000000000 +0200 @@ -28,5 +28,5 @@ bugtracker: https://github.com/ingydotnet/yaml-pm/issues homepage: https://github.com/ingydotnet/yaml-pm repository: https://github.com/ingydotnet/yaml-pm.git -version: '1.25' +version: '1.26' x_serialization_backend: 'YAML::Tiny version 1.70' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-1.25/Makefile.PL new/YAML-1.26/Makefile.PL --- old/YAML-1.25/Makefile.PL 2018-05-11 19:59:15.000000000 +0200 +++ new/YAML-1.26/Makefile.PL 2018-05-18 21:57:37.000000000 +0200 @@ -23,7 +23,7 @@ "Test::More" => "0.88", "Test::YAML" => "1.05" }, - "VERSION" => "1.25", + "VERSION" => "1.26", "test" => { "TESTS" => "t/*.t" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-1.25/README new/YAML-1.26/README --- old/YAML-1.25/README 2018-05-11 19:59:15.000000000 +0200 +++ new/YAML-1.26/README 2018-05-18 21:57:37.000000000 +0200 @@ -4,7 +4,7 @@ VERSION - This document describes YAML version 1.25. + This document describes YAML version 1.26. NOTE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-1.25/lib/YAML/Any.pm new/YAML-1.26/lib/YAML/Any.pm --- old/YAML-1.25/lib/YAML/Any.pm 2018-05-11 19:59:15.000000000 +0200 +++ new/YAML-1.26/lib/YAML/Any.pm 2018-05-18 21:57:37.000000000 +0200 @@ -1,6 +1,6 @@ use strict; use warnings; package YAML::Any; -our $VERSION = '1.25'; +our $VERSION = '1.26'; use Exporter (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-1.25/lib/YAML/Loader/Base.pm new/YAML-1.26/lib/YAML/Loader/Base.pm --- old/YAML-1.25/lib/YAML/Loader/Base.pm 2018-05-11 19:59:15.000000000 +0200 +++ new/YAML-1.26/lib/YAML/Loader/Base.pm 2018-05-18 21:57:37.000000000 +0200 @@ -21,6 +21,7 @@ has minor_version => default => sub {0}; has inline => default => sub {''}; has numify => default => sub {0}; +has zero_indent => default => sub {[]}; sub set_global_options { my $self = shift; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-1.25/lib/YAML/Loader.pm new/YAML-1.26/lib/YAML/Loader.pm --- old/YAML-1.25/lib/YAML/Loader.pm 2018-05-11 19:59:15.000000000 +0200 +++ new/YAML-1.26/lib/YAML/Loader.pm 2018-05-18 21:57:37.000000000 +0200 @@ -43,6 +43,7 @@ $self->_parse_throwaway_comments(); $self->document(0); $self->documents([]); + $self->zero_indent([]); # Add an "assumed" header if there is no header and the stream is # not empty (after initial throwaways). if (not $self->eos) { @@ -127,7 +128,6 @@ } $self->inline(''); while (length $preface) { - my $line = $self->line - 1; if ($preface =~ s/^($FOLD_CHAR|$LIT_CHAR_RX)//) { $indicator = $1; if ($preface =~ s/^([+-])[0-9]*//) { @@ -225,7 +225,6 @@ my ($anchor, $alias, $explicit, $implicit, $token) = ('') x 5; $self->inline(''); while ($preface =~ /^[&*!]/) { - my $line = $self->line - 1; if ($preface =~ s/^\!(\S+)\s*//) { $self->die('YAML_PARSE_ERR_MANY_EXPLICIT') if $explicit; $explicit = $1; @@ -362,9 +361,15 @@ $self->die('YAML_LOAD_ERR_BAD_MAP_ELEMENT'); } $self->preface($self->content); - my $line = $self->line; + my $level = $self->level; + + # we can get a zero indented sequence, possibly + my $zero_indent = $self->zero_indent; + $zero_indent->[ $level ] = 0; $self->_parse_next_line(COLLECTION); my $value = $self->_parse_node(); + $#$zero_indent = $level; + if (exists $mapping->{$key}) { $self->warn('YAML_LOAD_WARN_DUPLICATE_KEY', $key); } @@ -386,6 +391,9 @@ $self->preface(defined($1) ? $1 : ''); } else { + if ($self->zero_indent->[ $self->level ]) { + last; + } $self->die('YAML_LOAD_ERR_BAD_SEQ_ELEMENT'); } @@ -408,7 +416,7 @@ $preface =~ /^ (\s*) ((') (?:''|[^'])*? ' \s* \: (?:\ |$).*) $/x or $preface =~ /^ (\s*) ((") (?:\\\\|[^"])*? " \s* \: (?:\ |$).*) $/x or $preface =~ /^ (\s*) (\?.*$)/x or - $preface =~ /^ (\s*) ([^\s:#&!\[\]\{\},*|>].*\:(\ .*|$))/x + $preface =~ /^ (\s*) ([^'"\s:#&!\[\]\{\},*|>].*\:(\ .*|$))/x ) { $self->indent($self->offset->[$self->level] + 2 + length($1)); $self->content($2); @@ -720,10 +728,22 @@ elsif ($type == COLLECTION and $self->preface =~ /^(\s*(\!\S*|\&\S+))*\s*$/) { $self->_parse_throwaway_comments(); + my $zero_indent = $self->zero_indent; if ($self->eos) { $self->offset->[$level+1] = $offset + 1; return; } + elsif ( + defined $zero_indent->[ $level ] + and not $zero_indent->[ $level ] + and $self->lines->[0] =~ /^( {$offset,})-(?: |$)/ + ) { + my $new_offset = length($1); + $self->offset->[$level+1] = $new_offset; + if ($new_offset == $offset) { + $zero_indent->[ $level+1 ] = 1; + } + } else { $self->lines->[0] =~ /^( *)\S/ or $self->die('YAML_PARSE_ERR_NONSPACE_INDENTATION'); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-1.25/lib/YAML.pm new/YAML-1.26/lib/YAML.pm --- old/YAML-1.25/lib/YAML.pm 2018-05-11 19:59:15.000000000 +0200 +++ new/YAML-1.26/lib/YAML.pm 2018-05-18 21:57:37.000000000 +0200 @@ -1,5 +1,5 @@ package YAML; -our $VERSION = '1.25'; +our $VERSION = '1.26'; use YAML::Mo; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-1.25/lib/YAML.pod new/YAML-1.26/lib/YAML.pod --- old/YAML-1.25/lib/YAML.pod 2018-05-11 19:59:15.000000000 +0200 +++ new/YAML-1.26/lib/YAML.pod 2018-05-18 21:57:37.000000000 +0200 @@ -12,7 +12,7 @@ =head1 VERSION -This document describes L<YAML> version B<1.25>. +This document describes L<YAML> version B<1.26>. =head1 NOTE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-1.25/t/errors.t new/YAML-1.26/t/errors.t --- old/YAML-1.25/t/errors.t 2018-05-11 19:59:15.000000000 +0200 +++ new/YAML-1.26/t/errors.t 2018-05-18 21:57:37.000000000 +0200 @@ -1,6 +1,6 @@ use strict; use lib -e 't' ? 't' : 'test'; -use TestYAML tests => 38; +use TestYAML tests => 39; $^W = 1; use YAML::Error; @@ -405,4 +405,12 @@ --- some: data-preceded-with-tab: abc +=== YAML_PARSE_ERR_INCONSISTENT_INDENTATION ++++ error: YAML_PARSE_ERR_INCONSISTENT_INDENTATION ++++ yaml +--- +a: + b: + - 1 + - 2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/YAML-1.25/t/load-tests.t new/YAML-1.26/t/load-tests.t --- old/YAML-1.25/t/load-tests.t 2018-05-11 19:59:15.000000000 +0200 +++ new/YAML-1.26/t/load-tests.t 2018-05-18 21:57:37.000000000 +0200 @@ -1,6 +1,6 @@ use strict; use lib -e 't' ? 't' : 'test'; -use TestYAML tests => 37; +use TestYAML tests => 38; use Test::Deep; run { @@ -482,5 +482,38 @@ - .: a <: b -: c +- 'not: a map' +- "not: a map" +++ perl -[ { '.' => 'a', '<' => 'b', '-' => 'c' } ] +[ { '.' => 'a', '<' => 'b', '-' => 'c' }, 'not: a map', 'not: a map' ] + +=== Zero indented block sequence ++++ yaml +a: + b: + - + - +c: + - + - +d: +- 1 +- 2 +e: + - 3 + - 4 + - f: + - 5 + - 6 + g: 7 ++++ perl +{ + a => { b => [ undef, undef ] }, + c => [undef, undef], + d => [1, 2], + e => [3, 4, { + f => [5, 6], + g => 7, + }], +} +
