X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/0de566d74fdaf0a49123989fe8d4ad06603c6608..d7c7f8cb4f4968929fb1f7f2186312ba1593b59e:/regen_perly.pl diff --git a/regen_perly.pl b/regen_perly.pl index da917e0..3b94093 100644 --- a/regen_perly.pl +++ b/regen_perly.pl @@ -2,7 +2,7 @@ # # regen_perly.pl, DAPM 12-Feb-04 # -# Copyright (c) 2004 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: @@ -11,6 +11,7 @@ # #line directives plus adding a #ifdef PERL_CORE # # perly.tab the parser table C definitions extracted from the bison output +# plus an extra table generated by this script. # # perly.act the action case statements extracted from the bison output # @@ -28,11 +29,14 @@ # 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; use strict; +BEGIN { require 'regen/regen_lib.pl'; } + my $bison = 'bison'; if (@ARGV >= 2 and $ARGV[0] eq '-b') { @@ -60,69 +64,125 @@ die "$0: must be run on an ASCII system\n" unless ord 'A' == 65; # this; 1.35+ does # * Must produce output which is extractable by the regexes below # * Must produce the right values. -# These last two contstraints may well be met by earlier versions, but +# These last two constraints may well be met by earlier versions, but # I simply haven't tested them yet. If it works for you, then modify # the test below to allow that version too. DAPM Feb 04. my $version = `$bison -V`; -unless ($version =~ /\b1\.875\b/) { die <; } +{ 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); -chmod 0644, $act_file; -open ACTFILE, ">$act_file" or die "can't open $act_file: $!\n"; -print ACTFILE $actlines; -close ACTFILE; -chmod 0444, $act_file; +our %tokens; +$tablines .= make_type_tab($y_file, $tablines); + +my ($act_fh, $tab_fh, $h_fh) = map { + open_new($_, '>', { by => $0, from => $y_file }); +} $act_file, $tab_file, $h_file; -chmod 0644, $tab_file; -open TABFILE, ">$tab_file" or die "can't open $tab_file: $!\n"; -print TABFILE $tablines; -close TABFILE; -chmod 0444, $tab_file; +print $act_fh $actlines; + +print $tab_fh $tablines; unlink $tmpc_file; # Wrap PERL_CORE round the symbol definitions. Also, the -# C<#line 123 "perlytmp.h"> gets picked up by make depend, so change it. +# 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 my $tmph_fh, '<', $tmph_file or die "Can't open $tmph_file: $!\n"; + +# add integer-encoded #def of the bison version + +{ + $version =~ /^(\d+)\.(\d+)/ + or die "Can't handle bison version format: '$version'"; + my ($v1,$v2) = ($1,$2); + die "Unexpectedly large bison version '$v1'" if $v1 > 99; + die "Unexpectedly large bison subversion '$v2'" if $v2 > 9999; + + printf $h_fh "#define PERL_BISON_VERSION %2d%04d\n\n", $v1, $v2; +} -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"; my $endcore_done = 0; -while () { - print H_FILE "#ifdef PERL_CORE\n" if $. == 1; +# Token macros need to be generated manually from bison 2.4 on +my $gather_tokens = $version >= 2.4 ? undef : 0; +my $tokens; +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 <= 3 ? 'yyr2' : 'yystos'; $clines =~ m@ (?: ^/* YYFINAL[^\n]+\n #optional comment )? \# \s* define \s* YYFINAL # first #define .*? # other defines + most tables - yystos\[\]\s*= # start of last table + $last_table\[\]\s*= # start of last table .*? }\s*; # end of last table @xms @@ -149,34 +210,134 @@ sub extract { $clines =~ m@ switch \s* \( \s* \w+ \s* \) \s* { \s* ( - case \s* \d+ \s* : \s* - \#line [^\n]+"perly\.y" + 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" - | - \#line[^\n]+\.simple" + YY_SYMBOL_PRINT ) @xms 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"; } - - +# Generate a table, yy_type_tab[], that specifies for each token, what +# type of value it holds. +# +# Read the .y file and extract a list of all the token names and +# non-terminal names; then scan the string $tablines for the table yytname, +# which gives the token index of each token/non-terminal; then use this to +# create yy_type_tab. +# +# ie given (in perly.y), +# +# %token A +# %token B +# %type C +# %type D +# +# and (in $tablines), +# +# yytname[] = { "A" "B", "C", "D", "E" }; +# +# then return +# +# typedef enum { toketype_ival, toketype_opval, toketype_pval } toketypes; +# +# static const toketypes yy_type_tab[] +# = { toketype_opval, toketype_ival, toketype_pval, +# toketype_opval, toketype_ival } +# +# where "E" has the default type. The default type is determined +# by the __DEFAULT__ comment next to the appropriate union member in +# perly.y + +sub make_type_tab { + my ($y_file, $tablines) = @_; + my %just_tokens; + my %tokens; + my %types; + my $default_token; + open my $fh, '<', $y_file or die "Can't open $y_file: $!\n"; + while (<$fh>) { + if (/(\$\d+)\s*=[^=]/) { + warn "$y_file:$.: dangerous assignment to $1: $_"; + } + + if (/__DEFAULT__/) { + m{(\w+) \s* ; \s* /\* \s* __DEFAULT__}x + or die "$y_file: can't parse __DEFAULT__ line: $_"; + die "$y_file: duplicate __DEFAULT__ line: $_" + if defined $default_token; + $default_token = $1; + next; + } + + next unless /^%(token|type)/; + s/^%((token)|type)\s+<(\w+)>\s+// + or die "$y_file: unparseable token/type line: $_"; + 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 + (.*?) + ^}; + /xsm + or die "Can't extract yytname[] from table string\n"; + my $fields = $1; + $fields =~ s{"([^"]+)"} + { "toketype_" . + (defined $tokens{$1} ? $tokens{$1} : $default_token) + }ge; + $fields =~ s/, \s* (?:0|YY_NULL|YY_NULLPTR) \s* $//x + or die "make_type_tab: couldn't delete trailing ',0'\n"; + + return + "\ntypedef enum {\n\t" + . join(", ", map "toketype_$_", sort keys %types) + . "\n} toketypes;\n\n" + . "/* type of each token/terminal */\n" + . "static const toketypes yy_type_tab[] =\n{\n" + . $fields + . "\n};\n"; +} sub my_system { system(@_); if ($? == -1) { - die "failed to execute comamnd '@_': $!\n"; + die "failed to execute command '@_': $!\n"; } elsif ($? & 127) { die sprintf "command '@_' died with signal %d\n",