summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Williamson <khw@cpan.org>2015-06-27 15:31:31 -0600
committerKarl Williamson <khw@cpan.org>2015-07-28 22:15:55 -0600
commit0d484900e789d35a35d176da7f57bf0c73a65b46 (patch)
tree153df3d88ec79a7f9f5ad3a949eaad509d50b21c
parentebdbc7262e606c43971c8ac6f885bf9b7e84d805 (diff)
downloadperl-0d484900e789d35a35d176da7f57bf0c73a65b46.tar.gz
Unicode::UCD: Handle old Unicode Blocks file format
-rw-r--r--charclass_invlists.h2
-rw-r--r--lib/Unicode/UCD.pm4
-rw-r--r--regcharclass.h2
3 files changed, 6 insertions, 2 deletions
diff --git a/charclass_invlists.h b/charclass_invlists.h
index 8f21b01ce1..4d6358b079 100644
--- a/charclass_invlists.h
+++ b/charclass_invlists.h
@@ -99479,7 +99479,7 @@ static const UV XPosixXDigit_invlist[] = { /* for EBCDIC POSIX-BC */
#endif /* EBCDIC POSIX-BC */
/* Generated from:
- * b32261c9bf79e5e25de72f2af500acf5dfa262eb974f43af2a1d4b53e13b248c lib/Unicode/UCD.pm
+ * 66700a18908cbab24510556f945f0ccdc071f0ad31506ac309adaf12bfb1ba99 lib/Unicode/UCD.pm
* ae98bec7e4f0564758eed81eca5015481ba32581f8a735a825b71b3bba714450 lib/unicore/ArabicShaping.txt
* 1687fe5994eb7e5c0dab8503fc2a1b3b479d91af9d3b8055941c9bd791f7d0b5 lib/unicore/BidiBrackets.txt
* 350d1302116194b0b21def287434b55c5088098fbc726e879f7420a391965643 lib/unicore/BidiMirroring.txt
diff --git a/lib/Unicode/UCD.pm b/lib/Unicode/UCD.pm
index bbf87e462b..b66ff9e818 100644
--- a/lib/Unicode/UCD.pm
+++ b/lib/Unicode/UCD.pm
@@ -876,6 +876,10 @@ sub _charblocks {
local $_;
local $/ = "\n";
while (<$BLOCKSFH>) {
+
+ # Old versions used a different syntax to mark the range.
+ $_ =~ s/;\s+/../ if $v_unicode_version lt v3.1.0;
+
if (/^([0-9A-F]+)\.\.([0-9A-F]+);\s+(.+)/) {
my ($lo, $hi) = (hex($1), hex($2));
my $subrange = [ $lo, $hi, $3 ];
diff --git a/regcharclass.h b/regcharclass.h
index 93eb15013c..dd24d39cc2 100644
--- a/regcharclass.h
+++ b/regcharclass.h
@@ -2472,7 +2472,7 @@
#endif /* H_REGCHARCLASS */
/* Generated from:
- * b32261c9bf79e5e25de72f2af500acf5dfa262eb974f43af2a1d4b53e13b248c lib/Unicode/UCD.pm
+ * 66700a18908cbab24510556f945f0ccdc071f0ad31506ac309adaf12bfb1ba99 lib/Unicode/UCD.pm
* ae98bec7e4f0564758eed81eca5015481ba32581f8a735a825b71b3bba714450 lib/unicore/ArabicShaping.txt
* 1687fe5994eb7e5c0dab8503fc2a1b3b479d91af9d3b8055941c9bd791f7d0b5 lib/unicore/BidiBrackets.txt
* 350d1302116194b0b21def287434b55c5088098fbc726e879f7420a391965643 lib/unicore/BidiMirroring.txt