Integrate with Sarathy.

p4raw-id: //depot/cfgperl@4913

10 files changed, 27 insertions, 15 deletions

diff --git a/ext/B/B/C.pm b/ext/B/B/C.pm
index 6e3af0d5bc..fa1053f1e1 100644
--- a/ext/B/B/C.pm
+++ b/ext/B/B/C.pm
@@ -1576,6 +1576,8 @@ No copy-on-grow.
 Optimisation level (n = 0, 1, 2, ...). B<-O> means B<-O1>.  Currently,
 B<-O1> and higher set B<-fcog>.
 
+=back
+
 =head1 EXAMPLES
 
     perl -MO=C,-ofoo.c foo.pl
diff --git a/ext/B/B/Deparse.pm b/ext/B/B/Deparse.pm
index be7088e768..f8bcc7c8df 100644
--- a/ext/B/B/Deparse.pm
+++ b/ext/B/B/Deparse.pm
@@ -1194,7 +1194,7 @@ BEGIN {
 sub deparse_binop_left {
     my $self = shift;
     my($op, $left, $prec) = @_;
-    if ($left{assoc_class($op)}
+    if ($left{assoc_class($op)} && $left{assoc_class($left)}
 	and $left{assoc_class($op)} == $left{assoc_class($left)})
     {
 	return $self->deparse($left, $prec - .00001);
@@ -1227,7 +1227,7 @@ BEGIN {
 sub deparse_binop_right {
     my $self = shift;
     my($op, $right, $prec) = @_;
-    if ($right{assoc_class($op)}
+    if ($right{assoc_class($op)} && $right{assoc_class($right)}
 	and $right{assoc_class($op)} == $right{assoc_class($right)})
     {
 	return $self->deparse($right, $prec - .00001);
diff --git a/ext/B/B/Stash.pm b/ext/B/B/Stash.pm
index d992a89af8..fca3443c13 100644
--- a/ext/B/B/Stash.pm
+++ b/ext/B/B/Stash.pm
@@ -4,7 +4,7 @@ package B::Stash;
 
 BEGIN { %Seen = %INC }
 
-STOP {
+CHECK {
 	my @arr=scan($main::{"main::"});
 	@arr=map{s/\:\:$//;$_;}  @arr;
 	print "-umain,-u", join (",-u",@arr) ,"\n";
diff --git a/ext/B/NOTES b/ext/B/NOTES
index 8309892d80..89d03ba9a2 100644
--- a/ext/B/NOTES
+++ b/ext/B/NOTES
@@ -161,8 +161,8 @@ O module
 	it should return a sub ref (usually a closure) to perform the
 	actual compilation. When O regains control, it ensures that the
 	"-c" option is forced (so that the program being compiled doesn't
-	end up running) and registers a STOP block to call back the sub ref
+	end up running) and registers a CHECK block to call back the sub ref
 	returned from the backend's compile(). Perl then continues by
 	parsing prog.pl (just as it would with "perl -c prog.pl") and after
-	doing so, assuming there are no parse-time errors, the STOP block
+	doing so, assuming there are no parse-time errors, the CHECK block
 	of O gets called and the actual backend compilation happens. Phew.
diff --git a/ext/B/O.pm b/ext/B/O.pm
index d07c4a5b0f..352f8d4206 100644
--- a/ext/B/O.pm
+++ b/ext/B/O.pm
@@ -11,7 +11,7 @@ sub import {
     my $compilesub = &{"B::${backend}::compile"}(@options);
     if (ref($compilesub) eq "CODE") {
 	minus_c;
-	eval 'STOP { &$compilesub() }';
+	eval 'CHECK { &$compilesub() }';
     } else {
 	die $compilesub;
     }
@@ -59,7 +59,7 @@ C<B::Backend> module and calls the C<compile> function in that
 package, passing it OPTIONS. That function is expected to return
 a sub reference which we'll call CALLBACK. Next, the "compile-only"
 flag is switched on (equivalent to the command-line option C<-c>)
-and a STOP block is registered which calls CALLBACK. Thus the main
+and a CHECK block is registered which calls CALLBACK. Thus the main
 Perl program mentioned on the command-line is read in, parsed and
 compiled into internal syntax tree form. Since the C<-c> flag is
 set, the program does not start running (excepting BEGIN blocks of
diff --git a/ext/Devel/Peek/Peek.pm b/ext/Devel/Peek/Peek.pm
index 17b1519c3b..38251c6ee8 100644
--- a/ext/Devel/Peek/Peek.pm
+++ b/ext/Devel/Peek/Peek.pm
@@ -373,32 +373,32 @@ This shows that
 
 =over
 
-=item
+=item *
 
 the subroutine is not an XSUB (since C<START> and C<ROOT> are
 non-zero, and C<XSUB> is zero);
 
-=item
+=item *
 
 that it was compiled in the package C<main>;
 
-=item
+=item *
 
 under the name C<MY::top_targets>; 
 
-=item
+=item *
 
 inside a 5th eval in the program;
 
-=item
+=item *
 
 it is not currently executed (see C<DEPTH>);
 
-=item
+=item *
 
 it has no prototype (C<PROTOTYPE> field is missing).
 
-=over
+=back
 
 =head1 EXPORTS
 
diff --git a/ext/File/Glob/Glob.pm b/ext/File/Glob/Glob.pm
index ea56b445b7..6026499a80 100644
--- a/ext/File/Glob/Glob.pm
+++ b/ext/File/Glob/Glob.pm
@@ -238,7 +238,7 @@ The FreeBSD extensions to the POSIX standard are the following flags:
 
 =item C<GLOB_BRACE>
 
-Pre-process the string to expand C<{pat,pat,...} strings like csh(1).
+Pre-process the string to expand C<{pat,pat,...}> strings like csh(1).
 The pattern '{}' is left unexpanded for historical reasons (and csh(1)
 does the same thing to ease typing of find(1) patterns).
 
@@ -331,6 +331,8 @@ Win32 users should use the real slash.  If you really want to use
 backslashes, consider using Sarathy's File::DosGlob, which comes with
 the standard Perl distribution.
 
+=back
+
 =head1 AUTHOR
 
 The Perl interface was written by Nathan Torkington E<lt>gnat@frii.comE<gt>,
diff --git a/ext/IO/lib/IO/Socket/INET.pm b/ext/IO/lib/IO/Socket/INET.pm
index 7818508fe2..30a923034a 100644
--- a/ext/IO/lib/IO/Socket/INET.pm
+++ b/ext/IO/lib/IO/Socket/INET.pm
@@ -332,6 +332,8 @@ by default. This was not the case with earlier releases.
 
  NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE
 
+=back
+
 =head2 METHODS
 
 =over 4
diff --git a/ext/IPC/SysV/SysV.pm b/ext/IPC/SysV/SysV.pm
index eb245937aa..bebb8fd81b 100644
--- a/ext/IPC/SysV/SysV.pm
+++ b/ext/IPC/SysV/SysV.pm
@@ -74,11 +74,15 @@ C<IPC::SysV> defines and conditionally exports all the constants
 defined in your system include files which are needed by the SysV
 IPC calls.
 
+=over
+
 =item ftok( PATH, ID )
 
 Return a key based on PATH and ID, which can be used as a key for
 C<msgget>, C<semget> and C<shmget>. See L<ftok>
 
+=back
+
 =head1 SEE ALSO
 
 L<IPC::Msg>, L<IPC::Semaphore>, L<ftok>
diff --git a/ext/Thread/Thread.pm b/ext/Thread/Thread.pm
index 32e4c82bf7..5e47d413e9 100644
--- a/ext/Thread/Thread.pm
+++ b/ext/Thread/Thread.pm
@@ -176,6 +176,8 @@ increasing integer assigned when a thread is created. The main thread of a
 program will have a tid of zero, while subsequent threads will have tids
 assigned starting with one.
 
+=back
+
 =head1 LIMITATIONS
 
 The sequence number used to assign tids is a simple integer, and no