Changeset 5431

Timestamp:

01/24/08 23:34:25 (5 years ago)

Author:

tokuhirom

Message:

- fixed module load order problem.
- cache convert-utf8-map.pl.

Files:

• lang/perl/Encode-JP-Mobile/branches/character/lib/Encode/JP/Mobile/Character.pm (modified) (4 diffs)

lang/perl/Encode-JP-Mobile/branches/character/lib/Encode/JP/Mobile/Character.pm

@@ -4 +4 @@
 use Encode;
 use Encode::JP::Mobile::Charnames;
-use Encode::JP::Mobile ':props';
+use Encode::JP::Mobile;
 use File::ShareDir 'dist_file';
 use Carp;
@@ -62 +62 @@
 }
 
+my $fallback_name_cache;
 sub fallback_name {
     my ($self, $carrier) = @_;
@@ -67 +68 @@
     croak "invalid carrier name(docomo, kddi, softbank)" unless $carrier =~ /^(?:kddi|docomo|softbank)$/;
 
-    my $src = dist_file('Encode-JP-Mobile', 'convert-map-utf8.pl');
-    my $dat = do $src;
-    for my $from (keys %$dat) {
-        if (my $row = $dat->{$from}->{sprintf '%X', $self->{unicode}}->{$carrier}) {
+    $fallback_name_cache ||= do {
+        my $src = dist_file('Encode-JP-Mobile', 'convert-map-utf8.pl');
+        do $src;
+    };
+
+    for my $from (keys %$fallback_name_cache) {
+        if (my $row = $fallback_name_cache->{$from}->{sprintf '%X', $self->{unicode}}->{$carrier}) {
             if ($row->{type} eq 'name') {
                 return decode 'utf8', $row->{unicode};
@@ -84 +88 @@
     my $self = shift;
     my $uni = chr $self->{unicode};
-    if ($uni =~ /\p{InDoCoMoPictograms}/) {
+    if ($uni =~ /\p{Encode::JP::Mobile::InDoCoMoPictograms}/) {
         return 'I';
-    } elsif ($uni =~ /\p{InSoftBankPictograms}/) {
+    } elsif ($uni =~ /\p{Encode::JP::Mobile::InSoftBankPictograms}/) {
         return 'V';
-    } elsif ($uni =~ /\p{InKDDIAutoPictograms}/) {
+    } elsif ($uni =~ /\p{Encode::JP::Mobile::InKDDIAutoPictograms}/) {
         return 'E';
     } else {