Change 15182 by ams@lustre on 2002/03/12 04:04:34
Subject: Re: ext/Encode/t/Tcl.t on VMS @15173
From: Autrijus Tang <[EMAIL PROTECTED]>
Date: Tue, 12 Mar 2002 12:56:46 +0800
Message-Id: <[EMAIL PROTECTED]>
(Private mail.)
Affected files ...
.... //depot/perl/ext/Encode/Encode.pm#69 edit
.... //depot/perl/ext/Encode/lib/Encode/Tcl.pm#6 edit
Differences ...
==== //depot/perl/ext/Encode/Encode.pm#69 (text) ====
Index: perl/ext/Encode/Encode.pm
--- perl/ext/Encode/Encode.pm.~1~ Mon Mar 11 21:15:05 2002
+++ perl/ext/Encode/Encode.pm Mon Mar 11 21:15:05 2002
@@ -228,7 +228,7 @@
sub getEncoding
{
- my ($class,$name) = @_;
+ my ($class,$name,$skip_external) = @_;
my $enc;
if (ref($name) && $name->can('new_sequence'))
{
@@ -250,7 +250,7 @@
$oc = $class->findAlias($lc) if $lc ne $name;
return $oc if defined $oc;
- if (exists $external_tables{$lc})
+ if (!$skip_external and exists $external_tables{$lc})
{
require $external_tables{$lc};
return $encoding{$name} if exists $encoding{$name};
@@ -261,8 +261,8 @@
sub find_encoding
{
- my ($name) = @_;
- return __PACKAGE__->getEncoding($name);
+ my ($name,$skip_external) = @_;
+ return __PACKAGE__->getEncoding($name,$skip_external);
}
sub encode
==== //depot/perl/ext/Encode/lib/Encode/Tcl.pm#6 (text) ====
Index: perl/ext/Encode/lib/Encode/Tcl.pm
--- perl/ext/Encode/lib/Encode/Tcl.pm.~1~ Mon Mar 11 21:15:05 2002
+++ perl/ext/Encode/lib/Encode/Tcl.pm Mon Mar 11 21:15:05 2002
@@ -21,7 +21,7 @@
if ($name =~ /^(.*)\.enc$/)
{
my $canon = $1;
- my $obj = find_encoding($canon);
+ my $obj = find_encoding($canon, 1); # skip external tables
if (!defined($obj))
{
my $obj = bless { Name => $canon, File =>
"$dir/Encode/$name"},__PACKAGE__;
End of Patch.
