X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=keywords.pl;h=6ede80524cc875b6c70b232d97c2d5bafa959051;hb=f21000970ab9d31d61aef8d0ffdfbc9fdad80291;hp=fe745d470bfb8f504701067664afc495d9ed6e02;hpb=37442d52629699d89ef62d315d35efbc0facec21;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/keywords.pl b/keywords.pl
index fe745d4..6ede805 100755
--- a/keywords.pl
+++ b/keywords.pl
@@ -1,18 +1,18 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w
+use strict;
 
 require 'regen_lib.pl';
-safer_unlink ("keywords.h");
-open(KW, ">keywords.h") || die "Can't create keywords.h: $!\n";
-binmode KW;
-select KW;
+
+my $kw = safer_open("keywords.h-new");
+select $kw;
 
 print <<EOM;
 /* -*- buffer-read-only: t -*-
  *
  *    keywords.h
  *
- *    Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002,
- *    by Larry Wall and others
+ *    Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2005,
+ *    2006, 2007, by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -25,22 +25,24 @@ EOM
 
 # Read & print data.
 
-$keynum = 0;
+my $keynum = 0;
 while (<DATA>) {
     chop;
     next unless $_;
     next if /^#/;
-    ($keyword) = split;
+    my ($keyword) = split;
     print &tab(5, "#define KEY_$keyword"), $keynum++, "\n";
 }
 
-print KW "\n/* ex: set ro: */\n";
+print $kw "\n/* ex: set ro: */\n";
+
+safer_close($kw);
 
-close KW or die "Error closing keywords.h: $!";
+rename_if_different("keywords.h-new", "keywords.h");
 
 ###########################################################################
 sub tab {
-    local($l, $t) = @_;
+    my ($l, $t) = @_;
     $t .= "\t" x ($l - (length($t) + 1) / 8);
     $t;
 }
@@ -55,6 +57,7 @@ __DATA__
 __END__
 AUTOLOAD
 BEGIN
+UNITCHECK
 CORE
 DESTROY
 END
@@ -68,6 +71,7 @@ atan2
 bind
 binmode
 bless
+break
 caller
 chdir
 chmod
@@ -85,6 +89,7 @@ cos
 crypt
 dbmclose
 dbmopen
+default
 defined
 delete
 die
@@ -101,7 +106,6 @@ endpwent
 endservent
 eof
 eq
-err
 eval
 exec
 exists
@@ -142,6 +146,7 @@ getservbyport
 getservent
 getsockname
 getsockopt
+given
 glob
 gmtime
 goto
@@ -219,6 +224,7 @@ rewinddir
 rindex
 rmdir
 s
+say
 scalar
 seek
 seekdir
@@ -253,6 +259,7 @@ sprintf
 sqrt
 srand
 stat
+state
 study
 sub
 substr
@@ -289,6 +296,7 @@ wait
 waitpid
 wantarray
 warn
+when
 while
 write
 x