X-Git-Url: http://git.shiar.nl/perl/list-index.git/blobdiff_plain/f5f900c433ee5247b0466d0e3efcd3f66ff664d9..d6c30ef4ef400982bc1b08e9b7bf93993ea29be5:/lib/List/Index.pm diff --git a/lib/List/Index.pm b/lib/List/Index.pm index 9c86bc3..c42db44 100644 --- a/lib/List/Index.pm +++ b/lib/List/Index.pm @@ -43,7 +43,7 @@ sub ranges { for my $i (0 .. $#links - 1) { my ($link, $lastchar) = $links[$i + 1]->[0] =~ /(.*)(.)/; - $link .= $lastchar eq '.' ? 'z' : chr( ord($lastchar) - 1 ) + $link .= $lastchar eq '.' ? 'a' : chr( ord($lastchar) - 1 ) unless $lastchar eq 'a'; $links[$i]->[1] = $link; } @@ -59,6 +59,10 @@ sub rangematch { my @allow; if (length $s1) { + if (length $s2) { + $s1 le $s2 or $s1 =~ /^\Q$s2/ or return undef; + } + my $prefix = ''; my $char; for my $i (0 .. length($s1) - 1) { @@ -90,7 +94,7 @@ sub rangematch { if (length $s1 > $i) { my $c1 = substr $s1, $i, 1; if ($s1 =~ /^\Q$prefix/) { - next if $c1 eq $char; + next if $c1 le $char; } } push @allow, $prefix."(?![$char-$last])"