1 files changed, 86 insertions, 8 deletions

diff --git a/gnu/usr.bin/perl/ext/B/t/showlex.t b/gnu/usr.bin/perl/ext/B/t/showlex.t
index 501a00bf257..9ac528818e1 100644
--- a/gnu/usr.bin/perl/ext/B/t/showlex.t
+++ b/gnu/usr.bin/perl/ext/B/t/showlex.t
@@ -12,18 +12,18 @@ BEGIN {
         print "1..0 # Skip -- Perl configured without B module\n";
         exit 0;
     }
+    require './test.pl';
 }
 
-$|  = 1;
+$| = 1;
 use warnings;
 use strict;
 use Config;
+use B::Showlex ();
 
-print "1..1\n";
+plan tests => 15;
 
-my $test = 1;
-
-sub ok { print "ok $test\n"; $test++ }
+my $verbose = @ARGV; # set if ANY ARGS
 
 my $a;
 my $Is_VMS = $^O eq 'VMS';
@@ -35,9 +35,87 @@ my $redir = $Is_MacOS ? "" : "2>&1";
 my $is_thread = $Config{use5005threads} && $Config{use5005threads} eq 'define';
 
 if ($is_thread) {
-    print "# use5005threads: test $test skipped\n";
+    ok "# use5005threads: test skipped\n";
 } else {
     $a = `$^X $path "-MO=Showlex" -e "my \@one" $redir`;
-    print "# [$a]\nnot " unless $a =~ /sv_undef.*PVNV.*\@one.*sv_undef.*AV/s;
+    like ($a, qr/sv_undef.*PVNV.*\@one.*sv_undef.*AV/s,
+	  "canonical usage works");
+}
+
+# v1.01 tests
+
+my ($na,$nb,$nc);	# holds regex-strs
+my ($out, $newlex);	# output, option-flag
+
+sub padrep {
+    my ($varname,$newlex) = @_;
+    return ($newlex)
+	? 'PVNV \(0x[0-9a-fA-F]+\) "\\'.$varname.'" = '
+	: "PVNV \\\(0x[0-9a-fA-F]+\\\) \\$varname\n";
+}
+
+for $newlex ('', '-newlex') {
+
+    $out = runperl ( switches => ["-MO=Showlex,$newlex"],
+		     prog => 'my ($a,$b)', stderr => 1 );
+    $na = padrep('$a',$newlex);
+    $nb = padrep('$b',$newlex);
+    like ($out, qr/1: $na/ms, 'found $a in "my ($a,$b)"');
+    like ($out, qr/2: $nb/ms, 'found $b in "my ($a,$b)"');
+
+    print $out if $verbose;
+
+SKIP: {
+    skip "no perlio in this build", 5
+    unless $Config::Config{useperlio};
+
+    our $buf = 'arb startval';
+    my $ak = B::Showlex::walk_output (\$buf);
+
+    my $walker = B::Showlex::compile( $newlex, sub{my($foo,$bar)} );
+    $walker->();
+    $na = padrep('$foo',$newlex);
+    $nb = padrep('$bar',$newlex);
+    like ($buf, qr/1: $na/ms, 'found $foo in "sub { my ($foo,$bar) }"');
+    like ($buf, qr/2: $nb/ms, 'found $bar in "sub { my ($foo,$bar) }"');
+
+    print $buf if $verbose;
+
+    $ak = B::Showlex::walk_output (\$buf);
+
+    my $src = 'sub { my ($scalar,@arr,%hash) }';
+    my $sub = eval $src;
+    $walker = B::Showlex::compile($sub);
+    $walker->();
+    $na = padrep('$scalar',$newlex);
+    $nb = padrep('@arr',$newlex);
+    $nc = padrep('%hash',$newlex);
+    like ($buf, qr/1: $na/ms, 'found $scalar in "'. $src .'"');
+    like ($buf, qr/2: $nb/ms, 'found @arr    in "'. $src .'"');
+    like ($buf, qr/3: $nc/ms, 'found %hash   in "'. $src .'"');
+
+    print $buf if $verbose;
+
+    # fibonacci function under test
+    my $asub = sub {
+	my ($self,%props)=@_;
+	my $total;
+	{ # inner block vars
+	    my (@fib)=(1,2);
+	    for (my $i=2; $i<10; $i++) {
+		$fib[$i] = $fib[$i-2] + $fib[$i-1];
+	    }
+	    for my $i(0..10) {
+		$total += $i;
+	    }
+	}
+    };
+    $walker = B::Showlex::compile($asub, $newlex, -nosp);
+    $walker->();
+    print $buf if $verbose;
+
+    $walker = B::Concise::compile($asub, '-exec');
+    $walker->();
+
+}
 }
-ok;