X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FUnicode%2FCollate.pm;h=8522a79f2c3cf6afc6ee25ccdb59361bb03d1f98;hb=80a5d8e74b5512d4ab704d0e83466ae41247ce55;hp=43446162a94e1318fec23ecf691132c6d20a355b;hpb=004283b80f6094bb85aba6f48a74e3c5c34ea24f;p=p5sagit%2Fp5-mst-13.2.git diff --git a/lib/Unicode/Collate.pm b/lib/Unicode/Collate.pm index 4344616..8522a79 100644 --- a/lib/Unicode/Collate.pm +++ b/lib/Unicode/Collate.pm @@ -137,26 +137,24 @@ sub parseEntry # get element my($e, $k) = split /;/, $line; my @e = _getHexArray($e); - { no warnings 'utf8'; $ele = pack('U*', @e); } + $ele = pack('U*', @e); return if defined $self->{undefChar} && $ele =~ /$self->{undefChar}/; # get sort key - { no warnings 'utf8'; - if( + if( defined $self->{ignoreName} && $name =~ /$self->{ignoreName}/ || defined $self->{ignoreChar} && $ele =~ /$self->{ignoreChar}/ - ) - { - $self->{entries}{$ele} = $self->{ignored}{$ele} = 1; - } - else - { - foreach my $arr ($k =~ /\[(\S+)\]/g) { - my $var = $arr =~ /\*/; - push @key, $self->altCE( $var, _getHexArray($arr) ); - } - $self->{entries}{$ele} = \@key; + ) + { + $self->{entries}{$ele} = $self->{ignored}{$ele} = 1; + } + else + { + foreach my $arr ($k =~ /\[(\S+)\]/g) { + my $var = $arr =~ /\*/; + push @key, $self->altCE( $var, _getHexArray($arr) ); } + $self->{entries}{$ele} = \@key; } $self->{maxlength}{ord $ele} = scalar @e if @e > 1; }