X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=Xchat%2FXPI.pm;h=7481f5c0ac88c395510243a5a5758e5f39fcea70;hb=80f827633d7173e4388bfce83f6bb304f37cecab;hp=db07c1ca37e7f20a69936d2023e99b9f59a3d785;hpb=7088940630753b96c6584e759e53f41044e833d1;p=perl%2Fscripts%2Fxchat.git

diff --git a/Xchat/XPI.pm b/Xchat/XPI.pm
index db07c1c..7481f5c 100644
--- a/Xchat/XPI.pm
+++ b/Xchat/XPI.pm
@@ -7,7 +7,7 @@ use Tie::RefHash;
 
 use Xchat;
 
-our $VERSION = '0.04';
+our $VERSION = '0.05';
 
 use constant { COLOR_TAG => "\00307" };
 
@@ -24,18 +24,27 @@ sub new {
  my %opts  = @_;
 
  my $caller = (caller 0)[0];
- $opts{tag}     ||= ($caller =~ /([^:]*):*$/) ? $1 : 'UNKNOWN';
- $opts{name}    ||= $opts{tag};
- $opts{desc}    ||= $opts{name};
- $opts{version} ||= do { no strict 'refs'; ${$caller.'::VERSION'} }
-                || '0.01';
-
- my $email = $opts{email};
- $email    = "<$email>" if defined $email;
-
- my $who = join ', ', grep defined, $opts{author}, $email, $opts{url};
- $who    = " ($who)" if length $who;
- $opts{banner} = $opts{desc} . $who;
+ unless (defined $opts{tag}) {
+  $opts{tag}     = ($caller =~ /([^:]*):*$/) ? $1 : 'UNKNOWN';
+ }
+ unless (defined $opts{name}) {
+  $opts{name}    = $opts{tag};
+ }
+ unless (defined $opts{desc}) {
+  $opts{desc}    = $opts{name};
+ }
+ unless (defined $opts{version}) {
+  my $version    = do { no strict 'refs'; ${$caller.'::VERSION'} };
+  $version       = '0.01' unless defined $version;
+  $opts{version} = $version;
+ }
+ unless (defined $opts{banner}) {
+  my $email      = $opts{email};
+  $email         = "<$email>" if defined $email;
+  my $who        = join ', ', grep defined, $opts{author}, $email, $opts{url};
+  $who           = " ($who)"  if length $who;
+  $opts{banner}  = $opts{desc} . $who;
+ }
 
  my $ph = bless \do { local *PH }, $class;
  tie *$ph, $ph, @_;
@@ -60,7 +69,10 @@ sub new {
  return $ph;
 }
 
-eval "sub $_ { *\$_[0]->{$_} }" for @attributes;
+BEGIN {
+ local $@;
+ eval "sub $_ { my \$ph = \$_[0]; *\$ph->{$_} }; 1" or die $@ for @attributes;
+}
 
 sub print {
  my $ph = shift;
@@ -123,12 +135,4 @@ sub PRINT  { shift->print(@_) }
 
 sub PRINTF { shift->printf(@_) }
 
-my $ph = __PACKAGE__->new(
- name   => 'Extended Xchat Perl Interface',
- desc   => 'Adds extended support for Perl scripts',
- author => 'Vincent Pit (VPIT)',
- email  => 'perl@profvince.com',
- url    => 'http://www.profvince.com',
-);
-
 1;