# 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 =~ /\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
my ($actlines, $tablines) = extract($clines);
-$tablines .= make_opval_tab($y_file, $tablines);
+$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, $h_file;
open H_FILE, ">$h_file" or die "Can't open $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/) {
$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;
$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"
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";
}
-# read a .y file and extract a list of all the token names and
-# non-terminal names that are declared to be of type opval
-# then scan the string $tablines for the table yytname which gives
-# the token index of each token/non-terminal, then use this to
-# create a new table, indexed by token number, which indicates
-# whether that token is of type opval.
+# 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),
#
-# ie given
-# %token <opval> A B
-# %type <opval> C D
+# %token <opval> A
+# %token <ival> B
+# %type <pval> C
+# %type <opval> D
#
-# and yytname[] = { "A" "B", "C", "D", "E", "F" };
+# and (in $tablines),
+#
+# yytname[] = { "A" "B", "C", "D", "E" };
#
# then return
-# static const int yy_is_opval[] = { 1, 1, 1, 1, 0, 0 }
+#
+# 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_opval_tab {
+sub make_type_tab {
my ($y_file, $tablines) = @_;
my %tokens;
+ my %types;
+ my $default_token;
open my $fh, '<', $y_file or die "Can't open $y_file: $!\n";
while (<$fh>) {
- next unless s/^%(token|type)\s+<opval>\s+//;
- $tokens{$_} =1 for (split ' ', $_);
+ 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: $_";
+ $tokens{$_} = $2 for (split ' ', $_);
+ $types{$2} = 1;
}
+ 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/"([^"]+)"/$tokens{$1}||0/ge;
+ $fields =~ s{"([^"]+)"}
+ { "toketype_" .
+ (defined $tokens{$1} ? $tokens{$1} : $default_token)
+ }ge;
+ $fields =~ s/, \s* 0 \s* $//x
+ or die "make_type_tab: couldn't delete trailing ',0'\n";
+
return
- "/* which symbols are of type opval */\n" .
- "static const int yy_is_opval[] =\n{\n" . $fields . "\n};\n";
+ "\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",
https://perl5.git.perl.org / perl5.git / blobdiff