X-Git-Url: http://git.shiar.net/perl/list-index.git/blobdiff_plain/f5f900c433ee5247b0466d0e3efcd3f66ff664d9..df37e7ec6afd25d57679dc37999a36887d2247ca:/lib/List/Index.pm

diff --git a/lib/List/Index.pm b/lib/List/Index.pm
index 9c86bc3..e30beef 100644
--- a/lib/List/Index.pm
+++ b/lib/List/Index.pm
@@ -29,7 +29,7 @@ sub ranges {
 		my $link = substr $self->[$offset], 0, $length;
 		if ($context) {
 			my $trim = 1;
-			my $before = $offset > $context ? $self->[$offset - $context] : '';
+			my $before = $offset > $context ? $self->[$offset - $context] : '.';
 			for my $match (split //, $before) {
 				scalar $link =~ /\G\Q$match/g or last;
 				$trim++;
@@ -43,11 +43,13 @@ sub ranges {
 
 	for my $i (0 .. $#links - 1) {
 		my ($link, $lastchar) = $links[$i + 1]->[0] =~ /(.*)(.)/;
-		$link .= $lastchar eq '.' ? 'z' : chr( ord($lastchar) - 1 )
-			unless $lastchar eq 'a';
+		$link .= $lastchar eq 'a' ? '.' : chr( ord($lastchar) - 1 )
+			unless $lastchar eq '.';
+		next if $link eq $links[$i]->[0] and $i;
 		$links[$i]->[1] = $link;
 	}
 	$links[-1]->[1] = '';
+	$links[0]->[0] = '';
 
 	return \@links;
 }
@@ -59,6 +61,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 +96,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])"