diff options
| author | Hugo van der Sanden <hv@crypt.org> | 2002-12-02 02:18:19 +0000 |
|---|---|---|
| committer | hv <hv@crypt.org> | 2002-12-02 02:18:19 +0000 |
| commit | 6c8d78fb324d7709ee76d3711608bab5f83d721f (patch) | |
| tree | c26f4a574ccbfe4e2113d6d0297347d1fb640c3b /lib/Unicode | |
| parent | a3985cdcc04b13974afc5f4635645003847806e4 (diff) | |
| download | perl-6c8d78fb324d7709ee76d3711608bab5f83d721f.tar.gz | |
integrate 5.8-maint: changes #18174 18187 18189-92 18202 18209 18214-5
p4raw-link: @18189 on //depot/maint-5.8/perl: 27314835b1b1ea8730d4a0eb871861ac238c63f9
p4raw-link: @18187 on //depot/maint-5.8/perl: 94e81ce4c47784f86829e70129b1d0a3e95ca51c
p4raw-link: @18174 on //depot/maint-5.8/perl: f8d24d869503bcd9df0e86aa5898c89996220bf8
p4raw-id: //depot/perl@18221
p4raw-branched: from //depot/maint-5.8/perl@18220 'branch in'
ext/POSIX/t/is.t
p4raw-integrated: from //depot/maint-5.8/perl@18220 'copy in'
README.os2 ext/GDBM_File/GDBM_File.pm ext/GDBM_File/Makefile.PL
lib/Unicode/UCD.pm t/op/subst.t (@17645..) INSTALL t/op/grep.t
(@18080..) ext/Fcntl/t/syslfs.t t/op/lfs.t (@18133..) 'merge
in' t/op/eval.t (@17645..) pod/perldiag.pod (@18146..)
lib/Unicode/UCD.t (@18156..) MANIFEST (@18173..)
Diffstat (limited to 'lib/Unicode')
| -rw-r--r-- | lib/Unicode/UCD.pm | 5 | ||||
| -rw-r--r-- | lib/Unicode/UCD.t | 12 |
2 files changed, 16 insertions, 1 deletions
diff --git a/lib/Unicode/UCD.pm b/lib/Unicode/UCD.pm index 96dee9a816..b28c6f7d83 100644 --- a/lib/Unicode/UCD.pm +++ b/lib/Unicode/UCD.pm @@ -295,6 +295,7 @@ my %BLOCKS; sub _charblocks { unless (@BLOCKS) { if (openunicode(\$BLOCKSFH, "Blocks.txt")) { + local $_; while (<$BLOCKSFH>) { if (/^([0-9A-F]+)\.\.([0-9A-F]+);\s+(.+)/) { my ($lo, $hi) = (hex($1), hex($2)); @@ -356,6 +357,7 @@ my %SCRIPTS; sub _charscripts { unless (@SCRIPTS) { if (openunicode(\$SCRIPTSFH, "Scripts.txt")) { + local $_; while (<$SCRIPTSFH>) { if (/^([0-9A-F]+)(?:\.\.([0-9A-F]+))?\s+;\s+(\w+)/) { my ($lo, $hi) = (hex($1), $2 ? hex($2) : hex($1)); @@ -493,6 +495,7 @@ my %COMPEXCL; sub _compexcl { unless (%COMPEXCL) { if (openunicode(\$COMPEXCLFH, "CompositionExclusions.txt")) { + local $_; while (<$COMPEXCLFH>) { if (/^([0-9A-F]+)\s+\#\s+/) { my $code = hex($1); @@ -563,6 +566,7 @@ my %CASEFOLD; sub _casefold { unless (%CASEFOLD) { if (openunicode(\$CASEFOLDFH, "CaseFolding.txt")) { + local $_; while (<$CASEFOLDFH>) { if (/^([0-9A-F]+); ([CFSI]); ([0-9A-F]+(?: [0-9A-F]+)*);/) { my $code = hex($1); @@ -643,6 +647,7 @@ my %CASESPEC; sub _casespec { unless (%CASESPEC) { if (openunicode(\$CASESPECFH, "SpecialCasing.txt")) { + local $_; while (<$CASESPECFH>) { if (/^([0-9A-F]+); ([0-9A-F]+(?: [0-9A-F]+)*)?; ([0-9A-F]+(?: [0-9A-F]+)*)?; ([0-9A-F]+(?: [0-9A-F]+)*)?; (\w+(?: \w+)*)?/) { my ($hexcode, $lower, $title, $upper, $condition) = diff --git a/lib/Unicode/UCD.t b/lib/Unicode/UCD.t index 9082057bbd..b9bf574d13 100644 --- a/lib/Unicode/UCD.t +++ b/lib/Unicode/UCD.t @@ -12,7 +12,7 @@ use strict; use Unicode::UCD; use Test::More; -BEGIN { plan tests => 162 }; +BEGIN { plan tests => 164 }; use Unicode::UCD 'charinfo'; @@ -279,3 +279,13 @@ ok($casespec->{az}->{code} eq '0307' && $casespec->{az}->{upper} eq '0307' && $casespec->{az}->{condition} eq 'az After_Soft_Dotted', 'casespec 0x307'); + +# perl #7305 UnicodeCD::compexcl is weird + +for (1) {$a=compexcl $_} +ok(1, 'compexcl read-only $_: perl #7305'); +grep {compexcl $_} %{{1=>2}}; +ok(1, 'compexcl read-only hash: perl #7305'); + + + |