From e269a677a2adb49fc79e6c2267551a716a55c559 Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Wed, 11 Nov 2009 04:03:31 +0100
Subject: [PATCH] +++: rangematch() fixes

---
 lib/List/Index.pm | 2 +-
 t/20-links.t      | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/List/Index.pm b/lib/List/Index.pm
index 6a818bb..89fdc75 100644
--- a/lib/List/Index.pm
+++ b/lib/List/Index.pm
@@ -65,8 +65,8 @@ sub rangematch {
 			$c1 = substr $s1, $i, 1;
 			my $c2 = length $s2 <= $i ? undef : substr $s2, $i, 1;
 			my $next = $i + 1 >= length($s1) ? $c1 : chr( ord($c1) + 1 );
-			$next le $c2 or next if defined $c2;
 			my $last = defined $c2 && $i == 0 ? chr( ord($c2) - (length $s2 > 1) ) : 'z';
+			$next le $last or next if defined $c2;
 			push @allow, $prefix."[$next-$last]";
 		}
 		continue {
diff --git a/t/20-links.t b/t/20-links.t
index 89f5dee..6a09314 100644
--- a/t/20-links.t
+++ b/t/20-links.t
@@ -2,8 +2,9 @@
 use strict;
 use warnings;
 
-use Test::More tests => 13;
+use Test::More tests => 18;
 use Test::NoWarnings;
+use Data::Dump 'pp';
 
 BEGIN { use_ok('List::Index' => 'rangematch'); }
 
@@ -15,9 +16,14 @@ for (
 	[  'q-'    =>    '[q-z]'],
 	['qqq-'    => '(?:[r-z]|q[r-z]|qq[q-z])'],
 	[  'q-x'   =>    '[q-x]'],
+	[  'q-q'   =>    '[q-q]'],
+	[ 'qq-qq'  =>                 'qq'],
+	[ 'qq-qqx' =>                                    'qq(?![x-z])|qqx'],
+	[  'q-qx'  =>                      '(?:q(?![x-z])|qx)'],
 	['qqq-xxx' => '(?:[r-w]|q[r-z]|qq[q-z]|x(?![x-z])|xx(?![x-z])|xxx)'],
 	['qqq-x'   => '(?:[r-x]|q[r-z]|qq[q-z])'],
 	['qqq-q'   =>       '(?:q[r-z]|qq[q-z])'],
+	['qaa-qb'  =>              '(?:qa[a-z]|q(?![b-z]))'],
 	[  'q-xxx' =>                '(?:[q-w]|x(?![x-z])|xx(?![x-z])|xxx)'],
 ) {
 	my ($in, $out) = @$_;
-- 
2.30.0