From e15f14b860d3c70311328804859c49790b7cf344 Mon Sep 17 00:00:00 2001
From: Ricardo Signes <rjbs@cpan.org>
Date: Fri, 14 Mar 2014 08:51:31 +0100
Subject: [PATCH] replace printTree with warningsTree

we return, rather than print, the warnings, so we can potentially
futz around with the string and put it where we like without
having to worry about C<select>
---
 regen/warnings.pl | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/regen/warnings.pl b/regen/warnings.pl
index e36da7c..c612794 100644
--- a/regen/warnings.pl
+++ b/regen/warnings.pl
@@ -202,7 +202,7 @@ sub mkRange
 }
 
 ###########################################################################
-sub printTree
+sub warningsTree
 {
     my $tre = shift ;
     my $prefix = shift ;
@@ -211,6 +211,8 @@ sub printTree
     my $max = (sort {$a <=> $b} map { length $_ } keys %$tre)[-1] ;
     my @keys = sort keys %$tre ;
 
+    my $rv = '';
+
     while ($k = shift @keys) {
 	$v = $tre->{$k};
 	die "Value associated with key '$k' is not an ARRAY reference"
@@ -218,12 +220,12 @@ sub printTree
 
         my $offset ;
 	if ($tre ne $tree) {
-	    print $prefix . "|\n" ;
-	    print $prefix . "+- $k" ;
+	    $rv .= $prefix . "|\n" ;
+	    $rv .= $prefix . "+- $k" ;
 	    $offset = ' ' x ($max + 4) ;
 	}
 	else {
-	    print $prefix . "$k" ;
+	    $rv .= $prefix . "$k" ;
 	    $offset = ' ' x ($max + 1) ;
 	}
 
@@ -231,13 +233,14 @@ sub printTree
 	if (ref $rest)
 	{
 	    my $bar = @keys ? "|" : " ";
-	    print " -" . "-" x ($max - length $k ) . "+\n" ;
-	    printTree ($rest, $prefix . $bar . $offset )
+	    $rv .= " -" . "-" x ($max - length $k ) . "+\n" ;
+	    $rv .= warningsTree ($rest, $prefix . $bar . $offset )
 	}
 	else
-	  { print "\n" }
+	  { $rv .= "\n" }
     }
 
+    return $rv;
 }
 
 ###########################################################################
@@ -279,7 +282,7 @@ sub mkOct
 
 if (@ARGV && $ARGV[0] eq "tree")
 {
-    printTree($tree, "    ") ;
+    print warningsTree($tree, "    ") ;
     exit ;
 }
 
@@ -472,7 +475,7 @@ select +(select($lexwarn), do {
 	last if /=for warnings.pl begin/;
     }
     print "\n";
-    printTree($tree, "    ") ;
+    print warningsTree($tree, "    ") ;
     print "\n";
     while(<$oldlexwarn>) {
 	last if /=for warnings.pl end/;
-- 
2.7.4