X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Futf8_heavy.pl;h=70bd018f81c14aa978369e31221d607a29c491f6;hb=f6d6199cd6711f5e8a8e6c1a57445fa6f848c822;hp=5637d12afa4bd32e178cdbc64652d317f7ae7ed2;hpb=9fdf68be0731526d7d18a86c19f0b68d4946728d;p=p5sagit%2Fp5-mst-13.2.git diff --git a/lib/utf8_heavy.pl b/lib/utf8_heavy.pl index 5637d12..70bd018 100644 --- a/lib/utf8_heavy.pl +++ b/lib/utf8_heavy.pl @@ -1,47 +1,126 @@ package utf8; +use strict; +use warnings; -my $DEBUG = 0; -my $seq = "AAA0000"; +sub DEBUG () { 0 } 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; - my $extras; - my $bits; - - if ($type and ref ${"${class}::{$type}"} eq $class) { - warn qq/Found \${"${class}::{$type}"}\n/ if $DEBUG; - return ${"${class}::{$type}"}; # Already there... - } - $type ||= $seq++; - - my $caller; - my $i = 0; - while (($caller = caller($i)) eq __PACKAGE__) { $i++ } - my $encoding = $enc{$caller} || "unicode"; - (my $file = $type) =~ s!::!/!g; - if ($file =~ /^In(.+)/) { - defined %utf8::In || do "$encoding/In.pl"; - if (exists $utf8::In{$1}) { - $file = "$enconding/In/$utf8::In{$1}"; - } - } else { - $file =~ s#^(Is|To)([A-Z].*)#$1/$2#; + print STDERR "SWASHNEW @_\n" if DEBUG; + + ## + ## 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; + + 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; + + ## + ## 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; + } + + 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 } - $list ||= eval { $caller->$type(); } - || do "$file.pl" - || do "$encoding/$file.pl" - || do "$encoding/Is/${type}.pl" - || croak("Can't find $encoding character property definition via $caller->$type or $file.pl"); - $| = 1; + my $extras; + my $bits; + my $ORIG = $list; if ($list) { my @tmp = split(/^/m, $list); my %seen; @@ -79,19 +158,20 @@ sub SWASHNEW { while ($x =~ /^([^0-9a-fA-F\n])(.*)/mg) { my $char = $1; my $name = $2; - # print STDERR "$1 => $2\n" if $DEBUG; + print STDERR "$1 => $2\n" if DEBUG; 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}; } } } - print STDERR "CLASS = $class, TYPE => $type, BITS => $bits, NONE => $none\nEXTRAS =>\n$extras\nLIST =>\n$list\n" if $DEBUG; + 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, @@ -99,17 +179,24 @@ 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. sub SWASHGET { + # See utf8.c:Perl_swash_fetch for problems with this interface. my ($self, $start, $len) = @_; local $^D = 0 if $^D; my $type = $self->{TYPE}; my $bits = $self->{BITS}; my $none = $self->{NONE}; - print STDERR "SWASHGET @_ [$type/$bits/$none]\n" if $DEBUG; + print STDERR "SWASHGET @_ [$type/$bits/$none]\n" if DEBUG; my $end = $start + $len; my $swatch = ""; my $key; @@ -127,7 +214,7 @@ sub SWASHGET { my $max = (defined $2 ? hex $2 : $min); my $val = hex $3; next if $max < $start; -# print "$min $max $val\n"; + print "$min $max $val\n" if DEBUG; if ($none) { if ($min < $start) { $val += $start - $min if $val < $none; @@ -135,7 +222,7 @@ sub SWASHGET { } for ($key = $min; $key <= $max; $key++) { last LINE if $key >= $end; -# print STDERR "$key => $val\n" if $DEBUG; + print STDERR "$key => $val\n" if DEBUG; vec($swatch, $key - $start, $bits) = $val; ++$val if $val < $none; } @@ -147,7 +234,7 @@ sub SWASHGET { } for ($key = $min; $key <= $max; $key++, $val++) { last LINE if $key >= $end; -# print STDERR "$key => $val\n" if $DEBUG; + print STDERR "$key => $val\n" if DEBUG; vec($swatch, $key - $start, $bits) = $val; } } @@ -164,7 +251,7 @@ sub SWASHGET { } for ($key = $min; $key <= $max; $key++) { last LINE if $key >= $end; -# print STDERR "$key => 1\n" if $DEBUG; + print STDERR "$key => 1\n" if DEBUG; vec($swatch, $key - $start, 1) = 1; } } @@ -175,7 +262,7 @@ sub SWASHGET { while ($x =~ /^([-+!])(.*)/mg) { my $char = $1; my $name = $2; - print STDERR "INDIRECT $1 $2\n" if $DEBUG; + print STDERR "INDIRECT $1 $2\n" if DEBUG; my $otherbits = $self->{$name}->{BITS}; croak("SWASHGET size mismatch") if $bits < $otherbits; my $other = $self->{$name}->SWASHGET($start, $len); @@ -215,7 +302,7 @@ sub SWASHGET { } } } - if ($DEBUG) { + if (DEBUG) { print STDERR "CELLS "; for ($key = 0; $key < $len; $key++) { print STDERR vec($swatch, $key, $bits), " ";