$self->{conf}{lastwasrange} = 0;
$self->{conf}{range}{high} = 0;
$self->{conf}{range}{low} = 0;
- $self->{conf}{except} = 0;
my @chunks = split /\s+/;
while (my $chunk = shift @chunks) {
# single values
if ($chunk =~ /^\d{1,3}$/) {
$self->add_tag($chunk);
+ $self->{conf}{except} = 0;
next;
}
# ranges
if ($chunk =~ /^\d{1,3}\.\.\d{1,3}$/) {
$self->add_range($chunk);
+ $self->{conf}{except} = 0;
next;
}
if ($chunk eq 'except') {
die "Keyword 'except' can only follow a range (line $.)\n"
unless $self->{conf}{lastwasrange};
- die "Keyword 'except' may only occur once per line (line $.)\n"
- if $self->{conf}{except};
$self->{conf}{except} = 1;
next;
}
if ($low > $high);
if ($self->{conf}{except}) {
die "Exception ranges must be within last addition range ($low..$high)\n"
- if ($low < $self->{range}{low} or $high > $self->{range}{high});
+ if ($low < $self->{conf}{range}{low} or $high > $self->{conf}{range}{high});
}
for my $tag ($low..$high) {
$self->add_tag($tag)
unless ($tag >= 0 and $tag <= 999);
if ($self->{conf}{except}) {
- $self->remove_tag($tag)
+ $self->remove_tag($tag);
} else {
die "Tag '$tag' specified twice\n"
if $self->{tags}{$tag};
$self->{tags}{$tag} = 1;
+ $self->{conf}{lastwasrange} = 0;
}
- $self->{conf}{lastwasrange} = 0;
}
=head2 remove_tag
Shawn Boyette, C<< <sboyette at esilibrary.com> >>
-=head1 TODO
-
-=over
-
-=item * Remove single-except rule?
-
-=back
-
=head1 BUGS
Please report any bugs or feature requests to the above email address.
=head1 COPYRIGHT & LICENSE
-Copyright 2009 Shawn Boyette, all rights reserved.
+Copyright 2009 Equinox, all rights reserved.
This program is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
#!perl -T
-use Test::More tests => 25;
+use Test::More tests => 33;
use Equinox::Migration::SimpleTagList;
# baseline object creation
is ($stl->has(655), 0, 'exception');
is ($stl->has(987), 0, 'exception');
is ($stl->has(400), 0, 'not in input set');
+
+$stl = Equinox::Migration::SimpleTagList->new( file => "./t/corpus/stl-1.txt");
+is ($stl->has(258), 1);
+is ($stl->has(259), 0, 'exception');
+is ($stl->has(274), 1);
+is ($stl->has(275), 0, 'exception');
+is ($stl->has(286), 1);
+is ($stl->has(285), 0, 'exception');
+is ($stl->has(305), 1);
+is ($stl->has(304), 0, 'exception');