Merge branch 'blead' of ssh://stevep@perl5.git.perl.org/gitroot/perl into blead

2 files changed, 30 insertions, 8 deletions

diff --git a/doio.c b/doio.c
index 6135efa46d..2e5947f9c3 100644
--- a/doio.c
+++ b/doio.c
@@ -1981,7 +1981,7 @@ Perl_do_ipcget(pTHX_ I32 optype, SV **mark, SV **sp)
 {
     dVAR;
     const key_t key = (key_t)SvNVx(*++mark);
-    const I32 n = (optype == OP_MSGGET) ? 0 : SvIVx(*++mark);
+    SV *nsv = optype == OP_MSGGET ? NULL : *++mark;
     const I32 flags = SvIVx(*++mark);
 
     PERL_ARGS_ASSERT_DO_IPCGET;
@@ -1996,11 +1996,11 @@ Perl_do_ipcget(pTHX_ I32 optype, SV **mark, SV **sp)
 #endif
 #ifdef HAS_SEM
     case OP_SEMGET:
-	return semget(key, n, flags);
+	return semget(key, (int) SvIV(nsv), flags);
 #endif
 #ifdef HAS_SHM
     case OP_SHMGET:
-	return shmget(key, n, flags);
+	return shmget(key, (size_t) SvUV(nsv), flags);
 #endif
 #if !defined(HAS_MSG) || !defined(HAS_SEM) || !defined(HAS_SHM)
     default:
diff --git a/regen_perly.pl b/regen_perly.pl
index fb01dbd824..859495faf1 100644
--- a/regen_perly.pl
+++ b/regen_perly.pl
@@ -66,11 +66,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[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
@@ -112,6 +112,9 @@ 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;
+# 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/) {
@@ -119,6 +122,19 @@ while (<TMPH_FILE>) {
 	$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;
@@ -153,13 +169,16 @@ sub extract {
     $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"
@@ -172,6 +191,9 @@ sub extract {
 	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;