X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Futf8_heavy.pl;h=70bd018f81c14aa978369e31221d607a29c491f6;hb=f6d6199cd6711f5e8a8e6c1a57445fa6f848c822;hp=4fbb112c230dba9eefa3fdc198e7c0f0e285761e;hpb=fa689c2334baa95cf3f3faa003c5d50ee4cd9b7a;p=p5sagit%2Fp5-mst-13.2.git diff --git a/lib/utf8_heavy.pl b/lib/utf8_heavy.pl index 4fbb112..70bd018 100644 --- a/lib/utf8_heavy.pl +++ b/lib/utf8_heavy.pl @@ -1,4 +1,6 @@ package utf8; +use strict; +use warnings; sub DEBUG () { 0 } @@ -6,106 +8,119 @@ sub DESTROY {} sub croak { require Carp; Carp::croak(@_) } +my %Cache; + +## +## "SWASH" == "SWATCH HASH". A "swatch" is a swatch of the Unicode landscape +## + sub SWASHNEW { my ($class, $type, $list, $minbits, $none) = @_; local $^D = 0 if $^D; print STDERR "SWASHNEW @_\n" if DEBUG; - if ($type and ref ${"${class}::{$type}"} eq $class) { - warn qq/Found \${"${class}::{$type}"}\n/ if DEBUG; - return ${"${class}::{$type}"}; # Already there... - } + ## + ## Get the list of codepoints for the type. + ## Called from utf8.c + ## + ## Given a $type, our goal is to fill $list with the set of codepoint + ## ranges. + ## + ## To make the parsing of $type clear, this code takes the a rather + ## unorthadox approach of last'ing out of the block once we have the + ## info we need. Were this to be a subroutine, the 'last' would just + ## be a 'return'. + ## + my $file; ## file to load data from, and also part of the %Cache key. + my $ListSorted = 0; - if ($type) { - $type =~ s/^\s+//; - $type =~ s/\s+$//; - - print "type = $type\n" if DEBUG; - - my $file; - - unless (defined $file) { - defined %utf8::Is || do "unicore/Is.pl"; - if ($type =~ /^(?:Is|Category\s*=\s*)?[- _]?([A-Z].*)$/i) { - my $istype = $1; - print "istype = $istype\n" if DEBUG; - unless ($list = do "unicore/Is/$istype.pl") { - if (exists $utf8::Is{$istype}) { - $file = "unicore/Is/$utf8::Is{$istype}"; - } else { - my $isprefix = substr(lc($istype), 0, 2); - print "isprefix = $isprefix\n" if DEBUG; - if (exists $utf8::IsPat{$isprefix}) { - my $Is = $istype; - print "isprefix = $isprefix, Is = $Is\n" if DEBUG; - for my $k (keys %{$utf8::IsPat{$isprefix}}) { - print "isprefix = $isprefix, Is = $Is, k = $k\n" if DEBUG; - if ($Is =~ /^$k$/i) { - $file = "unicore/Is/$utf8::IsPat{$isprefix}->{$k}"; - print "isprefix = $isprefix, Is = $Is, k = $k, file = $file\n" if DEBUG; - last; - } - } - } - } - } - } + if ($type) + { + $type =~ s/^\s+//; + $type =~ s/\s+$//; - unless (defined $file) { - defined %utf8::In || do "unicore/In.pl"; - $type = 'Lampersand' if $type =~ /^(?:Is)?L&$/; - $type = 'Assigned' if $type =~ /^(?:Is)?Assigned$/i; - $type = 'Unassigned' if $type =~ /^(?:Is)?Unassigned$/i; - if ($type =~ /^(In|(?:Script|Block)\s*=\s*)?[- _]?(?!herited$)(.+)/i) { - my $incat = $1 || ''; - my $intype = $2; - print "incat = $incat, intype = $intype\n" if DEBUG; - if (exists $utf8::In{$intype}) { - $file = "unicore/In/$utf8::In{$intype}"; - } else { - my $inprefix = substr(lc($intype), 0, 2); - print "inprefix = $inprefix\n" if DEBUG; - if (exists $utf8::InPat{$inprefix}) { - my $In = $intype; - print "inprefix = $inprefix, In = $In\n" if DEBUG; - for my $k (keys %{$utf8::InPat{$inprefix}}) { - print "inprefix = $inprefix, In = $In, k = $k\n" if DEBUG; - if ($In =~ /^$k$/i) { - my $i = $utf8::InPat{$inprefix}->{$k}; - print "inprefix = $inprefix, In = $In, k = $k, i = $i\n" if DEBUG; - next if $incat =~ /^S/ && - !exists $utf8::InScript{$i}; - next if $incat =~ /^B/ && - !exists $utf8::InBlock{$i}; - $file = "unicore/In/$i"; - print "inprefix = $inprefix, In = $In, k = $k, file = $file\n" if DEBUG; - last; - } - } - } - } - } - } + print "type = $type\n" if DEBUG; - unless (defined $file) { - if ($type =~ /^To([A-Z][A-Za-z]+)$/) { - $file = "unicore/To/$1"; - } - } - } + GETFILE: + { + ## + ## 'Is' is always optional, so if it's there, remove it. + ## Same with 'Category=' and 'Script='. + ## + ## 'Block=' is replaced by 'In'. + ## + $type =~ s/^Is(?:\s+|[-_])?//i + or + $type =~ s/^Category\s*=\s*//i + or + $type =~ s/^Script\s*=\s*//i + or + $type =~ s/^Block\s*=\s*/In/i; - if (defined $file) { - $list = do "$file.pl"; - } + ## + ## See if it's in the direct mapping table. + ## + require "unicore/Exact.pl"; + if (my $base = $utf8::Exact{$type}) { + $file = "unicore/lib/$base.pl"; + last GETFILE; + } + + ## + ## If not there exactly, try the canonical form. The canonical + ## form is lowercased, with any separators (\s+|[-_]) removed. + ## + my $canonical = lc $type; + $canonical =~ s/(?<=[a-z\d])(?:\s+|[-_])(?=[a-z\d])//g; + print "canonical = $canonical\n" if DEBUG; + + require "unicore/Canonical.pl"; + if (my $base = $utf8::Canonical{$canonical}) { + $file = "unicore/lib/$base.pl"; + last GETFILE; + } + + ## + ## Last attempt -- see if it's a "To" name (e.g. "ToLower") + ## + if ($type =~ /^To([A-Z][A-Za-z]+)$/) + { + $file = "unicore/To/$1.pl"; + ## would like to test to see if $file actually exists.... + last GETFILE; + } + + ## + ## If we reach this line, it's because we couldn't figure + ## out what to do with $type. Ouch. + ## + + return $type; + } - croak("Can't find Unicode character property \"$type\"") - unless $list; + print "found it (file='$file')\n" if DEBUG; + + ## + ## If we reach here, it was due to a 'last GETFILE' above, so we + ## have a filename, so now we load it if we haven't already. + ## If we have, return the cached results. The cache key is the + ## file to load. + ## + if ($Cache{$file} and ref($Cache{$file}) eq $class) + { + print "Returning cached '$file' for \\p{$type}\n" if DEBUG; + return $Cache{$class, $file}; + } + + $list = do $file; + $ListSorted = 1; ## we know that these lists are sorted } my $extras; my $bits; - + + my $ORIG = $list; if ($list) { my @tmp = split(/^/m, $list); my %seen; @@ -147,6 +162,7 @@ sub SWASHNEW { if ($char =~ /[-+!]/) { my ($c,$t) = split(/::/, $name, 2); # bogus use of ::, really my $subobj = $c->SWASHNEW($t, "", 0, 0, 0); + return $subobj unless ref $subobj; push @extras, $name => $subobj; $bits = $subobj->{BITS} if $bits < $subobj->{BITS}; } @@ -155,7 +171,7 @@ sub SWASHNEW { print STDERR "CLASS = $class, TYPE => $type, BITS => $bits, NONE => $none\nEXTRAS =>\n$extras\nLIST =>\n$list\n" if DEBUG; - ${"${class}::{$type}"} = bless { + my $SWASH = bless { TYPE => $type, BITS => $bits, EXTRAS => $extras, @@ -163,6 +179,12 @@ sub SWASHNEW { NONE => $none, @extras, } => $class; + + if ($file) { + $Cache{$class, $file} = $SWASH; + } + + return $SWASH; } # NOTE: utf8.c:swash_init() assumes entries are never modified once generated.