[perl.git] branch blead, updated. v5.17.1-207-g3c60b34

In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/3c60b34b858a855f08bc3af15e0081a8977e01c9?hp=1fa930f22a3485f9bb86d555541c3ac82dc767b6>

- Log -----------------------------------------------------------------
commit 3c60b34b858a855f08bc3af15e0081a8977e01c9
Author: Father Chrysostomos <sprout@cpan.org>
Date:   Wed Jun 27 12:49:28 2012 -0700

    perly.*: update regen_perly checksum

M	perly.act
M	perly.h
M	perly.tab

commit 2434f6283b79560bd9f70cad8d31c4f07ff3f5c8
Author: Reini Urban <rurban@x-ray.at>
Date:   Thu Jun 21 09:26:56 2012 -0500

    regen_perly.pl: support latest bison-2.5.1
    
    bison-2.5.1 adds less superfluous semicolons at the end of action blocks,
    but works fine.

M	regen_perly.pl
-----------------------------------------------------------------------

Summary of changes:
 perly.act      |    2 +-
 perly.h        |    2 +-
 perly.tab      |    2 +-
 regen_perly.pl |   10 +++++-----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/perly.act b/perly.act
index d5edcf7..ce830e3 100644
--- a/perly.act
+++ b/perly.act
@@ -1722,5 +1722,5 @@ case 2:
 
 /* Generated from:
  * 27cce68ad4844f1b8053bfc11206fb9f559e08be6cefd4a986aaa606c0e5fb38 perly.y
- * af56f4a86c1ef4bfc3d6a42ca6a75bb0adf9417da936013dca0d10b5eaa5efc4 regen_perly.pl
+ * 38f866dcd8341ad3c0810347587113eb2c6ac7d4f33bdab75b020efce92865be regen_perly.pl
  * ex: set ro: */
diff --git a/perly.h b/perly.h
index 558520c..d185ee9 100644
--- a/perly.h
+++ b/perly.h
@@ -248,5 +248,5 @@ typedef union YYSTYPE
 
 /* Generated from:
  * 27cce68ad4844f1b8053bfc11206fb9f559e08be6cefd4a986aaa606c0e5fb38 perly.y
- * af56f4a86c1ef4bfc3d6a42ca6a75bb0adf9417da936013dca0d10b5eaa5efc4 regen_perly.pl
+ * 38f866dcd8341ad3c0810347587113eb2c6ac7d4f33bdab75b020efce92865be regen_perly.pl
  * ex: set ro: */
diff --git a/perly.tab b/perly.tab
index c1402ca..86cc024 100644
--- a/perly.tab
+++ b/perly.tab
@@ -1090,5 +1090,5 @@ static const toketypes yy_type_tab[] =
 
 /* Generated from:
  * 27cce68ad4844f1b8053bfc11206fb9f559e08be6cefd4a986aaa606c0e5fb38 perly.y
- * af56f4a86c1ef4bfc3d6a42ca6a75bb0adf9417da936013dca0d10b5eaa5efc4 regen_perly.pl
+ * 38f866dcd8341ad3c0810347587113eb2c6ac7d4f33bdab75b020efce92865be regen_perly.pl
  * ex: set ro: */
diff --git a/regen_perly.pl b/regen_perly.pl
index dba4178..e0120fa 100644
--- a/regen_perly.pl
+++ b/regen_perly.pl
@@ -73,11 +73,11 @@ 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; }
+unless ($version =~ /\b(1\.875[a-z]?|2\.[01345])\b/) { die <<EOF; }
 
 You have the wrong version of bison in your path; currently 1.875
-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
+2.0, 2.1, 2.3, 2.4 or 2.5 is required.  Try installing
+    http://ftp.gnu.org/gnu/bison/bison-2.5.1.tar.gz
 or similar.  Your bison identifies itself as:
 
 $version
@@ -114,8 +114,8 @@ unlink $tmpc_file;
 open my $tmph_fh, '<', $tmph_file or die "Can't open $tmph_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);
+# Token macros need to be generated manually from bison 2.4 on
+my $gather_tokens = ($version =~ /\b2\.[45]\b/ ? undef : 0);
 my $tokens;
 while (<$tmph_fh>) {
     print $h_fh "#ifdef PERL_CORE\n" if $. == 1;

--
Perl5 Master Repository

• [perl.git] branch blead, updated. v5.17.1-207-g3c60b34 by Father Chrysostomos