mktables: Remove commented out obsolete code

[perl5.git] / regen_perly.pl

diff --git a/regen_perly.pl b/regen_perly.pl
index 9c1d601..e9e1be9 100644 (file)
--- a/regen_perly.pl
+++ b/regen_perly.pl
@@ -34,6 +34,8 @@ sub usage { die "usage: $0 [ -b bison_executable ] [ file.y ]\n" }
 use warnings;
 use strict;
 
+BEGIN { require 'regen_lib.pl'; }
+
 my $bison = 'bison';
 
 if (@ARGV >= 2 and $ARGV[0] eq '-b') {
@@ -50,6 +52,9 @@ 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
 
@@ -66,11 +71,15 @@ die "$0: must be run on an ASCII system\n" unless ord 'A' == 65;
 # the test below to allow that version too. DAPM Feb 04.
 
 my $version = `$bison -V`;
-unless ($version =~ /\b(1\.875[a-z]?|2\.[013])\b/) { die <<EOF; }
+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; }
 
 You have the wrong version of bison in your path; currently 1.875
-2.0, 2.1 or 2.3 is required.  Try installing
-    http://ftp.gnu.org/gnu/bison/bison-2.1.tar.gz
+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
 or similar.  Your bison identifies itself as:
 
 $version
@@ -90,17 +99,17 @@ my ($actlines, $tablines) = extract($clines);
 
 $tablines .= make_type_tab($y_file, $tablines);
 
-chmod 0644, $act_file;
-open ACTFILE, ">$act_file" or die "can't open $act_file: $!\n";
+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, $act_file;
+chmod 0444, $new_act_file;
 
-chmod 0644, $tab_file;
-open TABFILE, ">$tab_file" or die "can't open $tab_file: $!\n";
+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, $tab_file;
+chmod 0444, $new_tab_file;
 
 unlink $tmpc_file;
 
@@ -109,9 +118,12 @@ unlink $tmpc_file;
 # 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, $h_file;
-open H_FILE, ">$h_file" or die "Can't open $h_file: $!\n";
+chmod 0644, $new_h_file;
+open H_FILE, ">$new_h_file" or die "Can't open $new_h_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);
+my $tokens;
 while (<TMPH_FILE>) {
     print H_FILE "#ifdef PERL_CORE\n" if $. == 1;
     if (!$endcore_done and /YYSTYPE_IS_DECLARED/) {
@@ -119,14 +131,29 @@ while (<TMPH_FILE>) {
        $endcore_done = 1;
     }
     next if /^#line \d+ ".*"/;
+    if (not defined $gather_tokens) {
+       $gather_tokens = 1 if /^\s* enum \s* yytokentype \s* \{/x;
+    }
+    elsif ($gather_tokens) {
+       if (/^\# \s* endif/x) { # The #endif just after the end of the token enum
+           $gather_tokens = 0;
+           $_ .= "\n/* Tokens.  */\n$tokens";
+       }
+       else {
+           my ($tok, $val) = /(\w+) \s* = \s* (\d+)/x;
+           $tokens .= "#define $tok $val\n" if $tok;
+       }
+    }
     print H_FILE $_;
 }
 close TMPH_FILE;
 close H_FILE;
-chmod 0444, $h_file;
+chmod 0444, $new_h_file;
 unlink $tmph_file;
 
-print "rebuilt:  $h_file $tab_file $act_file\n";
+rename_if_different($new_h_file, $h_file);
+rename_if_different($new_tab_file, $tab_file);
+rename_if_different($new_act_file, $act_file);
 
 exit 0;
 
@@ -153,13 +180,16 @@ sub extract {
     $clines =~ m@
        switch \s* \( \s* \w+ \s* \) \s* { \s*
        (
-           case \s* \d+ \s* : \s*
+           case \s* \d+ \s* :
+           \s*
+           (?: \s* /\* .*? \*/ \s* )*  # optional C-comments
+           \s*
            \#line [^\n]+"\Q$y_file\E"
            .*?
        )
        }
        \s*
-       ( \s* /\* .*? \*/ \s* )*        # optional C-comments
+       (?: \s* /\* .*? \*/ \s* )*      # optional C-comments
        \s*
        (
            \#line[^\n]+\.c"
@@ -172,9 +202,17 @@ sub extract {
        or die "Can't extract actions from $tmpc_file\n";
     $actlines = $1;
 
+    # Remove extraneous comments from bison 2.4
+    $actlines =~ s!\s* /\* \s* Line \s* \d+ \s* of \s* yacc\.c \s* \*/!!gx;
+
     # C<#line 188 "perlytmp.c"> gets picked up by make depend, so remove them.
     $actlines =~ s/^#line \d+ "\Q$tmpc_file\E".*$//gm;
 
+    # convert yyvsp[nnn] into ps[nnn].val
+
+    $actlines =~ s/yyvsp\[(.*?)\]/ps[$1].val/g
+       or die "Can't convert value stack name\n";
+
     return $actlines. "\n", $tablines. "\n";
 }
 
@@ -257,7 +295,6 @@ sub make_type_tab {
        . join(", ", map "toketype_$_", sort keys %types)
        . "\n} toketypes;\n\n"
        . "/* type of each token/terminal */\n"
-       . "static const toketypes XXX;\n"
        . "static const toketypes yy_type_tab[] =\n{\n"
        . $fields
        . "\n};\n";