xcv_start and xcv_xsubany can be merged into a union, as they are never

[perl5.git] / regen_perly.pl

diff --git a/regen_perly.pl b/regen_perly.pl
index eaa4785..67f763f 100644 (file)
--- 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 Larry Wall
 #
 # Given an input file perly.y, run bison on it and produce
 # the following output files:
@@ -65,13 +65,11 @@ 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|2\.0)\b/) { die <<EOF; }
+unless ($version =~ /\b(1\.875[a-z]?|2\.[01])\b/) { die <<EOF; }
 
 You have the wrong version of bison in your path; currently 1.875
-or 2.0 is required.  Try installing
-    http://ftp.gnu.org/gnu/bison/bison-2.0.tar.gz
-or
-    http://ftp.gnu.org/gnu/bison/bison-1.875.tar.bz2
+2.0 or 2.1 is required.  Try installing
+    http://ftp.gnu.org/gnu/bison/bison-2.1.tar.gz
 or similar.  Your bison identifies itself as:
 
 $version
@@ -171,10 +169,6 @@ sub extract {
     return $actlines. "\n", $tablines. "\n";
 }
 
-       
-           
-
-
 sub my_system {
     system(@_);
     if ($? == -1) {