[Po4a-commits] po4a/lib/Locale/Po4a Common.pm,1.10,1.11

[Martin Quinson]

Update of /cvsroot/po4a/po4a/lib/Locale/Po4a
In directory haydn:/tmp/cvs-serv27359/lib/Locale/Po4a

Modified Files:
	Common.pm 
Log Message:
Faster version of the wrappers: don't check each time whether the dependency is available, but only once at BEGIN time and act accordingly

Index: Common.pm
===================================================================
RCS file: /cvsroot/po4a/po4a/lib/Locale/Po4a/Common.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Common.pm	28 Jun 2005 19:37:34 -0000	1.10
+++ Common.pm	10 Aug 2005 14:10:59 -0000	1.11
@@ -30,26 +30,29 @@
 use strict;
 use warnings;
 
-sub setcolumns() {
-    my $col=$ENV{COLUMNS};
-    if (!defined $col)
-    {
-        my @term=eval "use Term::ReadKey; Term::ReadKey::GetTerminalSize()";
-        $col=$term[0] if (!$@);
-        # If GetTerminalSize() failed we will fallback to a safe default.
-        # This can happen if Term::ReadKey is not available
-        # or this is a terminal-less build or such strange condition.
+BEGIN {
+    if (eval { require Text::WrapI18N }) {
+    
+        # Don't bother determining the wrap column if we cannot wrap.
+        my $col=$ENV{COLUMNS};
+        if (!defined $col) {
+            my @term=eval "use Term::ReadKey; Term::ReadKey::GetTerminalSize()";
+            $col=$term[0] if (!$@);
+            # If GetTerminalSize() failed we will fallback to a safe default.
+            # This can happen if Term::ReadKey is not available
+            # or this is a terminal-less build or such strange condition.
+        }
+        $col=76 if (!defined $col);
+        
+        use Text::WrapI18N qw($columns); 
+        $columns = $col;
+       
+        eval ' sub wrapi18n($$$) { Text::WrapI18N::wrap($_[0],$_[1],$_[2]) } '
+    } else {
+    
+        # If we cannot wrap, well, that's too bad. Survive anyway.
+        eval ' sub wrapi18n($$$) { $_[0].$_[2] } '
     }
-    $col=76 if (!defined $col);
-    eval "use Text::WrapI18N qw(\$columns); \$columns = $col";
-}
-
-sub wrapi18n($$$) {
-    my ($header1, $header2, $msg) = @_;
-    setcolumns();
-    my $wrapped=eval "use Text::WrapI18N qw(wrap); wrap(\$header1, \$header2, \$msg)";
-    $wrapped="$header1$msg" if ($@);
-    return $wrapped;
 }
 
 sub min($$) {
@@ -58,53 +61,13 @@
 
 =head1 FUNCTIONS
 
-=head2 Wrappers for other modules
-
-=item textdomain($)
-
-This is a wrapper for Locale::gettext's textdomain() so that po4a still
-works if that module is missing. This wrapper also calls
-setlocale(LC_MESSAGES, "") so callers don't depend on the POSIX module either.
-
-=cut
-
-sub textdomain
-{
-    my ($domain)=@_;
-    return eval "use Locale::gettext; use POSIX; setlocale(LC_MESSAGES, ''); textdomain(\$domain)";
-}
-
-=item gettext($)
-
-This is a wrapper for Locale::gettext's gettext() so that things still
-work ok if that module is missing.
-
-=cut
-
-sub gettext
-{
-    my ($str)=@_;
-    my $rc=eval "use Locale::gettext; Locale::gettext::gettext(\$str)";
-    return ($@ ? $str : $rc);
-}
-
-=item dgettext($$)
-
-This is a wrapper for Locale::gettext's dgettext() so that things still
-work ok if that module is missing.
-
-=cut
+=head2 Showing output messages
 
-sub dgettext
-{
-    my ($domain, $str)=@_;
-    my $rc=eval "use Locale::gettext; dgettext(\$domain, \$str)";
-    return ($@ ? $str : $rc);
-}
+=over
 
-=head2 Showing output messages
+=item 
 
-=item show_version($)
+show_version($)
 
 Shows the current version of the script, and a short copyright message. It
 takes the name of the script as an argument.
@@ -124,9 +87,12 @@
 	), $name, $Locale::Po4a::TransTractor::VERSION)."\n";
 }
 
-=item wrap_msg($@)
+=item 
 
-This function wraps a message handling the parameters like sprintf does.
+wrap_msg($@)
+
+This function displays a message the same way than sprintf() does, but wraps
+the result so that they look nice on the terminal.
 
 =cut
 
@@ -137,7 +103,9 @@
     return wrapi18n("", "", sprintf($msg, @args))."\n";
 }
 
-=item wrap_mod($$@)
+=item 
+
+wrap_mod($$@)
 
 This function works like wrap_msg(), but it takes a module name as the first
 argument, and leaves a space at the left of the message.
@@ -153,12 +121,16 @@
     return wrapi18n($mod, $spaces, sprintf($msg, @args))."\n";
 }
 
-=item wrap_ref_mod($$$@)
+=item 
+
+wrap_ref_mod($$$@)
 
 This function works like wrap_msg(), but it takes a file:line reference as the
 first argument, a module name as the second one, and leaves a space at the left
 of the message.
 
+=back
+
 =cut
 
 sub wrap_ref_mod($$$@) {
@@ -176,6 +148,64 @@
     }
 }
 
+=head2 Wrappers for other modules
+
+=over 
+
+=item 
+
+Locale::Gettext
+
+When the Locale::Gettext module cannot be loaded, this module provide dummy
+(empty) implementation of the following functions. In that case, po4a
+messages won't get translated but the program will continue to work.
+
+If Locale::gettext is present, this wrapper also calls
+setlocale(LC_MESSAGES, "") so callers don't depend on the POSIX module
+either.
+
+=over
+
+=item 
+
+bindtextdomain($$)
+
+=item 
+
+textdomain($)
+
+=item 
+
+gettext($)
+
+=item 
+
+dgettext($$)
+
+=back
+
+=back
+
+=cut
+
+BEGIN {
+    if (eval { require Locale::gettext }) {
+       import Locale::gettext;
+       use POSIX;
+       setlocale(LC_MESSAGES, '');
+    } else {
+       eval '
+           sub bindtextdomain($$) { }
+           sub textdomain($) { }
+           sub gettext($) { shift }
+           sub dgettext($$) { shift $_[1] }
+       '
+    }
+}
+
+
+=cut
+
 1;
 __END__