Add support for bison 3.0

Mainly it no longer generates some tables used for debugging.

This commit also adds a new define showing what bison version was used.

1 files changed, 18 insertions, 9 deletions

diff --git a/regen_perly.pl b/regen_perly.pl
index bf484bbed6..3b94093993 100644
--- a/regen_perly.pl
+++ b/regen_perly.pl
@@ -75,10 +75,10 @@ EOF
 
 # Don't change this to add new bison versions without testing that the generated
 # files actually work :-) Win32 in particular may not like them. :-(
-unless ($version =~ /\b(1\.875[a-z]?|2\.[0134567])\b/) { die <<EOF; }
+unless ($version =~ /\b(1\.875[a-z]?|2\.[0134567]|3\.[0])\b/) { die <<EOF; }
 
-You have the wrong version of bison in your path; currently 1.875
-2.0, 2.1, 2.3, 2.4, 2.5, 2.6 or 2.7 is required.  Try installing
+You have the wrong version of bison in your path; currently versions
+1.875, 2.0-2.7 or 3.0 are known toi work.  Try installing
     http://ftp.gnu.org/gnu/bison/bison-2.5.1.tar.gz
 or similar.  Your bison identifies itself as:
 
@@ -119,6 +119,18 @@ unlink $tmpc_file;
 
 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;
+}
+
 my $endcore_done = 0;
 # Token macros need to be generated manually from bison 2.4 on
 my $gather_tokens = $version >= 2.4 ? undef : 0;
@@ -180,13 +192,14 @@ sub extract {
     my $tablines;
     my $actlines;
 
+    my $last_table = $version >= 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
@@ -209,10 +222,6 @@ sub extract {
 	(?: \s* /\* .*? \*/ \s* )*	# optional C-comments
 	\s*
 	(
-	    \#line[^\n]+\.c"
-	|
-	    \#line[^\n]+\.simple"
-	|
 	    YY_SYMBOL_PRINT
 	)
     @xms
@@ -311,7 +320,7 @@ sub make_type_tab {
 		{ "toketype_" .
 		    (defined $tokens{$1} ? $tokens{$1} : $default_token)
 		}ge;
-    $fields =~ s/, \s* (?:0|YY_NULL) \s* $//x
+    $fields =~ s/, \s* (?:0|YY_NULL|YY_NULLPTR) \s* $//x
 	or die "make_type_tab: couldn't delete trailing ',0'\n";
 
     return