X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/8abc106000ee2bab64eb6bbd575619ce46f38081..1067df30ae91aad06ce62722a2ebd437e25358bf:/regen_perly.pl

diff --git a/regen_perly.pl b/regen_perly.pl
index e4de1a0..7907c20 100644
--- a/regen_perly.pl
+++ b/regen_perly.pl
@@ -2,7 +2,7 @@
 #
 # regen_perly.pl, DAPM 12-Feb-04
 #
-# Copyright (c) 2004, 2005 Larry Wall
+# Copyright (c) 2004, 2005, 2006, 2009, 2010, 2011 Larry Wall
 #
 # Given an input file perly.y, run bison on it and produce
 # the following output files:
@@ -29,6 +29,7 @@
 # it may work elsewhere but no specific attempt has been made to make it
 # portable.
 
+use 5.006;
 sub usage { die "usage: $0 [ -b bison_executable ] [ file.y ]\n" }
 
 use warnings;
@@ -52,9 +53,6 @@ usage unless @ARGV==0 && $y_file =~ /\.y$/;
 (my $tab_file  = $y_file) =~ s/\.y$/.tab/;
 (my $tmpc_file = $y_file) =~ s/\.y$/tmp.c/;
 (my $tmph_file = $y_file) =~ s/\.y$/tmp.h/;
-my $new_h_file = "$h_file-new";
-my $new_act_file = "$act_file-new";
-my $new_tab_file = "$tab_file-new";
 
 # the yytranslate[] table generated by bison is ASCII/EBCDIC sensitive
 
@@ -75,11 +73,11 @@ unless ($version) { die <<EOF; }
 Could not find a version of bison in your path. Please install bison.
 EOF
 
-unless ($version =~ /\b(1\.875[a-z]?|2\.[0134])\b/) { die <<EOF; }
+unless ($version =~ /\b(1\.875[a-z]?|2\.[0134567])\b/) { die <<EOF; }
 
 You have the wrong version of bison in your path; currently 1.875
-2.0, 2.1, 2.3 or 2.4 is required.  Try installing
-    http://ftp.gnu.org/gnu/bison/bison-2.4.1.tar.gz
+2.0, 2.1, 2.3-2.7 is required.  Try installing
+    http://ftp.gnu.org/gnu/bison/bison-2.7.tar.gz
 or similar.  Your bison identifies itself as:
 
 $version
@@ -88,28 +86,25 @@ EOF
 # creates $tmpc_file and $tmph_file
 my_system("$bison -d -o $tmpc_file $y_file");
 
-open CTMPFILE, $tmpc_file or die "Can't open $tmpc_file: $!\n";
+open my $ctmp_fh, '<', $tmpc_file or die "Can't open $tmpc_file: $!\n";
 my $clines;
-{ local $/; $clines = <CTMPFILE>; }
+{ local $/; $clines = <$ctmp_fh>; }
 die "failed to read $tmpc_file: length mismatch\n"
     unless length $clines == -s $tmpc_file;
-close CTMPFILE;
+close $ctmp_fh;
 
 my ($actlines, $tablines) = extract($clines);
 
+our %tokens;
 $tablines .= make_type_tab($y_file, $tablines);
 
-chmod 0644, $new_act_file;
-open ACTFILE, ">$new_act_file" or die "can't open $new_act_file: $!\n";
-print ACTFILE $actlines;
-close ACTFILE;
-chmod 0444, $new_act_file;
+my ($act_fh, $tab_fh, $h_fh) = map {
+    open_new($_, '>', { by => $0, from => $y_file });
+} $act_file, $tab_file, $h_file;
 
-chmod 0644, $new_tab_file;
-open TABFILE, ">$new_tab_file" or die "can't open $new_tab_file: $!\n";
-print TABFILE $tablines;
-close TABFILE;
-chmod 0444, $new_tab_file;
+print $act_fh $actlines;
+
+print $tab_fh $tablines;
 
 unlink $tmpc_file;
 
@@ -117,17 +112,36 @@ unlink $tmpc_file;
 # C<#line 30 "perly.y"> confuses the Win32 resource compiler and the
 # C<#line 188 "perlytmp.h"> gets picked up by make depend, so remove them.
 
-open TMPH_FILE, $tmph_file or die "Can't open $tmph_file: $!\n";
-chmod 0644, $new_h_file;
-open H_FILE, ">$new_h_file" or die "Can't open $new_h_file: $!\n";
+open my $tmph_fh, '<', $tmph_file or die "Can't open $tmph_file: $!\n";
+
 my $endcore_done = 0;
-# Token macros need to be generated manually on bison 2.4
-my $gather_tokens = ($version =~ /\b2\.4\b/ ? undef : 0);
+# Token macros need to be generated manually from bison 2.4 on
+my $gather_tokens = ($version =~ /\b2\.[456]\b/ ? undef : 0);
 my $tokens;
-while (<TMPH_FILE>) {
-    print H_FILE "#ifdef PERL_CORE\n" if $. == 1;
+while (<$tmph_fh>) {
+    # bison 2.6 adds header guards, which break things because of where we
+    # insert #ifdef PERL_CORE, so strip them because they aren't important
+    next if /YY_PERLYTMP_H/;
+
+    print $h_fh "#ifdef PERL_CORE\n" if $. == 1;
     if (!$endcore_done and /YYSTYPE_IS_DECLARED/) {
-	print H_FILE "#endif /* PERL_CORE */\n";
+	print $h_fh <<h;
+#ifdef PERL_IN_TOKE_C
+static bool
+S_is_opval_token(int type) {
+    switch (type) {
+h
+	print $h_fh <<i for sort grep $tokens{$_} eq 'opval', keys %tokens;
+    case $_:
+i
+	print $h_fh <<j;
+	return 1;
+    }
+    return 0;
+}
+#endif /* PERL_IN_TOKE_C */
+#endif /* PERL_CORE */
+j
 	$endcore_done = 1;
     }
     next if /^#line \d+ ".*"/;
@@ -144,16 +158,14 @@ while (<TMPH_FILE>) {
 	    $tokens .= "#define $tok $val\n" if $tok;
 	}
     }
-    print H_FILE $_;
+    print $h_fh $_;
 }
-close TMPH_FILE;
-close H_FILE;
-chmod 0444, $new_h_file;
+close $tmph_fh;
 unlink $tmph_file;
 
-rename_if_different($new_h_file, $h_file);
-rename_if_different($new_tab_file, $tab_file);
-rename_if_different($new_act_file, $act_file);
+foreach ($act_fh, $tab_fh, $h_fh) {
+    read_only_bottom_close_and_rename($_, ['regen_perly.pl', $y_file]);
+}
 
 exit 0;
 
@@ -249,6 +261,7 @@ sub extract {
 
 sub make_type_tab {
     my ($y_file, $tablines) = @_;
+    my %just_tokens;
     my %tokens;
     my %types;
     my $default_token;
@@ -268,16 +281,22 @@ sub make_type_tab {
 	}
 
 	next unless /^%(token|type)/;
-	s/^%(token|type)\s+<(\w+)>\s+//
+	s/^%((token)|type)\s+<(\w+)>\s+//
 	    or die "$y_file: unparseable token/type line: $_";
-	$tokens{$_} = $2 for (split ' ', $_);
-	$types{$2} = 1;
+	for (split ' ', $_) {
+	    $tokens{$_} = $3;
+	    if ($2) {
+		$just_tokens{$_} = $3;
+	    }
+	}
+	$types{$3} = 1;
     }
+    *tokens = \%just_tokens; # perly.h needs this
     die "$y_file: no __DEFAULT__ token defined\n" unless $default_token;
     $types{$default_token} = 1;
 
     $tablines =~ /^\Qstatic const char *const yytname[] =\E\n
-	    {\n
+	    \{\n
 	    (.*?)
 	    ^};
 	    /xsm
@@ -287,7 +306,7 @@ sub make_type_tab {
 		{ "toketype_" .
 		    (defined $tokens{$1} ? $tokens{$1} : $default_token)
 		}ge;
-    $fields =~ s/, \s* 0 \s* $//x
+    $fields =~ s/, \s* (?:0|YY_NULL) \s* $//x
 	or die "make_type_tab: couldn't delete trailing ',0'\n";
 
     return