Use B::Keywords

diff --git a/Makefile.PL b/Makefile.PL
index 403cdef833f177f0d1659f01f02af161a4742e81..7927178383b668f2db3e501657811ac3848a4269 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -12,6 +12,7 @@ my $dist = 'subs-auto';
 $file = "lib/$file.pm";
 
 my %PREREQ_PM = (
+ 'B::Keywords'     => 0,
  'Carp'            => 0,
  'Symbol'          => 0,
  'Variable::Magic' => '0.08',

diff --git a/lib/subs/auto.pm b/lib/subs/auto.pm
index 6b2dd5959af8fe6009c9398fb2c96ea398b66286..3657b1d3b6dbc7e4de61a54778fef9cde0a357ce 100644 (file)
--- a/lib/subs/auto.pm
+++ b/lib/subs/auto.pm
@@ -5,6 +5,8 @@ use 5.010;
 use strict;
 use warnings;
 
+use B::Keywords;
+
 use Carp qw/croak/;
 use Symbol qw/gensym/;
 
@@ -65,37 +67,13 @@ BEGIN {
  croak 'uvar magic not available' unless Variable::Magic::VMG_UVAR;
 }
 
-my @core = qw/abs accept alarm atan2 bind binmode bless break caller chdir
-              chmod chomp chop chown chr chroot close closedir connect
-              continue cos crypt dbmclose dbmopen default defined delete die
-              do dump each endgrent endhostent endnetent endprotoent endpwent
-              endservent eof eval exec exists exit exp fcntl fileno flock fork
-              format formline getc getgrent getgrgid getgrnam gethostbyaddr
-              gethostbyname gethostent getlogin getnetbyaddr getnetbyname
-              getnetent getpeername getpgrp getppid getpriority getprotobyname
-              getprotobynumber getprotoent getpwent getpwnam getpwuid
-              getservbyname getservbyport getservent getsockname getsockopt
-              given glob gmtime goto grep hex index int ioctl join keys kill
-              last lc lcfirst length link listen local localtime lock log
-              lstat map mkdir msgctl msgget msgrcv msgsnd my next no oct open
-              opendir ord our pack package pipe pop pos print printf prototype
-              push quotemeta rand read readdir readline readlink readpipe recv
-              redo ref rename require reset return reverse rewinddir rindex
-              rmdir say scalar seek seekdir select semctl semget semop send
-              setgrent sethostent setnetent setpgrp setpriority setprotoent
-              setpwent setservent setsockopt shift shmctl shmget shmread
-              shmwrite shutdown sin sleep socket socketpair sort splice split
-              sprintf sqrt srand stat state study sub substr symlink syscall
-              sysopen sysread sysseek system syswrite tell telldir tie tied
-              time times truncate uc ucfirst umask undef unlink unpack unshift
-              untie use utime values vec wait waitpid wantarray warn when
-              write/;
-push @core,qw/not __LINE__ __FILE__ DATA/;
-
 my %core;
-@core{@core} = ();
+@core{
+ @B::Keywords::Barewords,
+ @B::Keywords::Functions,
+ 'DATA',
+} = ();
 delete @core{qw/my local/};
-undef @core;
 
 BEGIN {
  *_REFCNT_PLACEHOLDERS = eval 'sub () { ' . ($] < 5.011002 ? 0 : 1) . '}'
@@ -224,6 +202,8 @@ L<Carp> (standard since perl 5), L<Symbol> (since 5.002).
 
 L<Variable::Magic> with C<uvar> magic enabled (this should be assured by the required perl version).
 
+L<B::Keywords>.
+
 =head1 AUTHOR
 
 Vincent Pit, C<< <perl at profvince.com> >>, L<http://www.profvince.com>.