From df37e7ec6afd25d57679dc37999a36887d2247ca Mon Sep 17 00:00:00 2001 From: Mischa POSLAWSKY Date: Thu, 12 Nov 2009 18:23:10 +0100 Subject: [PATCH] XXX: omit first link start --- lib/List/Index.pm | 3 ++- t/10-ranges.t | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/lib/List/Index.pm b/lib/List/Index.pm index 00f2bdb..e30beef 100644 --- a/lib/List/Index.pm +++ b/lib/List/Index.pm @@ -45,10 +45,11 @@ sub ranges { my ($link, $lastchar) = $links[$i + 1]->[0] =~ /(.*)(.)/; $link .= $lastchar eq 'a' ? '.' : chr( ord($lastchar) - 1 ) unless $lastchar eq '.'; - next if $link eq $links[$i]->[0]; + next if $link eq $links[$i]->[0] and $i; $links[$i]->[1] = $link; } $links[-1]->[1] = ''; + $links[0]->[0] = ''; return \@links; } diff --git a/t/10-ranges.t b/t/10-ranges.t index feedb14..2348fca 100644 --- a/t/10-ranges.t +++ b/t/10-ranges.t @@ -13,23 +13,23 @@ ok(eval { List::Index->VERSION(1) }, 'version 1.00 compatibility'); my @uniform = 'a'..'z'; ok(my $index = List::Index->new(\@uniform), 'object (single-char values)'); is_deeply(\@uniform, ['a'..'z'], 'original data unaltered'); -is_deeply($index->ranges, [['a','']], 'single page'); -is_deeply($index->ranges({pages => 3}), [map { [split /-/, $_, 2] } qw( - a-h i-q r- +is_deeply($index->ranges, [['','']], 'single page'); +is_deeply($index->ranges({pages => 3}), [map { [split /-/, $_, 3] } qw( + -h i-q r- )], 'given pages'); is_deeply($index->ranges({pagesize => @uniform / 2.1}), [map { [split /-/, $_, 2] } qw( - a-h i-q r- + -h i-q r- )], 'equivalent pagesize'); } { ok(my $index = List::Index->new(['aa'..'zz', 1..193]), 'non-alphabetic values (uniform)'); is_deeply($index->ranges, [map { [split /-/, $_, 2] } qw( - . ..-. .. ...-. + -. ..-. .. ...-. a-bv bw-dr ds-fn fo-hk hl-jg jh-k l-m n-ov ow-qr qs-sn so-uk ul-wg wh-x y- )], 'default ranges'); is_deeply($index->ranges({pagesize => 300}), [map { [split /-/, $_, 2] } qw( - .-c d-ov ow- + -c d-ov ow- )], 'large pagesize'); } @@ -38,16 +38,16 @@ ok(my $index = List::Index->new([qw( baa1 baa2 baa3 baaa bbc cbc daaa ea eaaa zed )]), 'variable length values'); is_deeply($index->ranges({pagesize => 2, context => 0}), [ - map { [split /-/, $_, 2] } qw(baa.-baa baa.-bbb bbc-daa. daaa-eaa. eaaa-) + map { [split /-/, $_, 2] } qw(-baa baa.-bbb bbc-daa. daaa-eaa. eaaa-) ], 'no context'); is_deeply($index->ranges({pagesize => 2}), [ - map { [split /-/, $_, 2] } qw(b-baa baa.-ba bb-c d-ea. eaa-) + map { [split /-/, $_, 2] } qw(-baa baa.-ba bb-c d-ea. eaa-) ], 'default context'); # context should be 1 is_deeply($index->ranges({pagesize => 2, context => 2}), [ - map { [split /-/, $_, 2] } qw(b-a b-ba bb-c d e-) + map { [split /-/, $_, 2] } qw(-a b-ba bb-c d e-) ], 'overlap'); # first item equals second due to large context is_deeply($index->ranges({pagesize => 2, length => 1}), [ - map { [split /-/, $_, 2] } qw(b-a b-a b-c d e-) + map { [split /-/, $_, 2] } qw(-a b-a b-c d e-) ], 'single char'); #pp($index->ranges({pagesize => 2, context => 2, length => 1})); -- 2.30.0