Upgrade to base 2.03.

(Rename the fields-5.6.0.t to have less d.o.t.s.)

p4raw-id: //depot/perl@21235

4 files changed, 616 insertions, 0 deletions

diff --git a/lib/base/t/base.t b/lib/base/t/base.t
new file mode 100644
index 0000000000..0ddd238439
--- /dev/null
+++ b/lib/base/t/base.t
@@ -0,0 +1,80 @@
+#!/usr/bin/perl -w
+
+use strict;
+use Test::More tests => 10;
+
+use_ok('base');
+
+
+package No::Version;
+
+use vars qw($Foo);
+sub VERSION { 42 }
+
+package Test::Version;
+
+use base qw(No::Version);
+::ok( $No::Version::VERSION =~ /set by base\.pm/,          '$VERSION bug' );
+
+# Test Inverse of $VERSION bug base.pm should not clobber existing $VERSION
+package Has::Version;
+
+BEGIN { $Has::Version::VERSION = '42' };
+
+package Test::Version2;
+
+use base qw(Has::Version);
+::is( $Has::Version::VERSION, 42 );
+
+package main;
+
+my $eval1 = q{
+  {
+    package Eval1;
+    {
+      package Eval2;
+      use base 'Eval1';
+      $Eval2::VERSION = "1.02";
+    }
+    $Eval1::VERSION = "1.01";
+  }
+};
+
+eval $eval1;
+is( $@, '' );
+
+is( $Eval1::VERSION, 1.01 );
+
+is( $Eval2::VERSION, 1.02 );
+
+
+eval q{use base 'reallyReAlLyNotexists'};
+like( $@, qr/^Base class package "reallyReAlLyNotexists" is empty./,
+                                          'base with empty package');
+
+eval q{use base 'reallyReAlLyNotexists'};
+like( $@, qr/^Base class package "reallyReAlLyNotexists" is empty./,
+                                          '  still empty on 2nd load');
+
+BEGIN { $Has::Version_0::VERSION = 0 }
+
+package Test::Version3;
+
+use base qw(Has::Version_0);
+::is( $Has::Version_0::VERSION, 0, '$VERSION==0 preserved' );
+
+
+package Test::SIGDIE;
+
+{ 
+    local $SIG{__DIE__} = sub { 
+        ::fail('sigdie not caught, this test should not run') 
+    };
+    eval {
+      'base'->import(qw(Huh::Boo));
+    };
+
+    ::like($@, qr/^Base class package "Huh::Boo" is empty/, 
+         'Base class empty error message');
+
+}
diff --git a/lib/base/t/fields-560.t b/lib/base/t/fields-560.t
new file mode 100644
index 0000000000..93bca34e2e
--- /dev/null
+++ b/lib/base/t/fields-560.t
@@ -0,0 +1,228 @@
+# The fields.pm and base.pm regression tests from 5.6.0
+
+# We skip this on 5.9.0 and up since pseudohashes were removed and a lot
+# of it won't work.
+if( $] >= 5.009 ) { 
+    print "1..0 # skip pseudo-hashes removed in 5.9.0\n";
+    exit;
+}
+
+use strict;
+use vars qw($Total_tests);
+
+my $test_num = 1;
+BEGIN { $| = 1; $^W = 1; }
+print "1..$Total_tests\n";
+use fields;
+use base;
+print "ok $test_num\n";
+$test_num++;
+
+# Insert your test code below (better if it prints "ok 13"
+# (correspondingly "not ok 13") depending on the success of chunk 13
+# of the test code):
+sub ok {
+    my($test, $name) = @_;
+    print "not " unless $test;
+    print "ok $test_num";
+    print " - $name" if defined $name;
+    print "\n";
+    $test_num++;
+}
+
+sub eqarray  {
+    my($a1, $a2) = @_;
+    return 0 unless @$a1 == @$a2;
+    my $ok = 1;
+    for (0..$#{$a1}) { 
+        unless($a1->[$_] eq $a2->[$_]) {
+            $ok = 0;
+            last;
+        }
+    }
+    return $ok;
+}
+
+# Change this to your # of ok() calls + 1
+BEGIN { $Total_tests = 14 }
+
+
+my $w;
+
+BEGIN {
+   $^W = 1;
+
+   $SIG{__WARN__} = sub {
+       if ($_[0] =~ /^Hides field 'b1' in base class/) {
+           $w++;
+           return;
+       }
+       print $_[0];
+   };
+}
+
+use strict;
+use vars qw($DEBUG);
+
+package B1;
+use fields qw(b1 b2 b3);
+
+package B2;
+use fields '_b1';
+use fields qw(b1 _b2 b2);
+
+sub new { bless [], shift }
+
+package D1;
+use base 'B1';
+use fields qw(d1 d2 d3);
+
+package D2;
+use base 'B1';
+use fields qw(_d1 _d2);
+use fields qw(d1 d2);
+
+package D3;
+use base 'B2';
+use fields qw(b1 d1 _b1 _d1);  # hide b1
+
+package D4;
+use base 'D3';
+use fields qw(_d3 d3);
+
+package M;
+sub m {}
+
+package D5;
+use base qw(M B2);
+
+package Foo::Bar;
+use base 'B1';
+
+package Foo::Bar::Baz;
+use base 'Foo::Bar';
+use fields qw(foo bar baz);
+
+# Test repeatability for when modules get reloaded.
+package B1;
+use fields qw(b1 b2 b3);
+
+package D3;
+use base 'B2';
+use fields qw(b1 d1 _b1 _d1);  # hide b1
+
+package main;
+
+sub fstr {
+   my $h = shift;
+   my @tmp;
+   for my $k (sort {$h->{$a} <=> $h->{$b}} keys %$h) {
+	my $v = $h->{$k};
+        push(@tmp, "$k:$v");
+   }
+   my $str = join(",", @tmp);
+   print "$h => $str\n" if $DEBUG;
+   $str;
+}
+
+my %expect;
+BEGIN {
+    %expect = (
+               B1 => "b1:1,b2:2,b3:3",
+               B2 => "_b1:1,b1:2,_b2:3,b2:4",
+               D1 => "b1:1,b2:2,b3:3,d1:4,d2:5,d3:6",
+               D2 => "b1:1,b2:2,b3:3,_d1:4,_d2:5,d1:6,d2:7",
+               D3 => "b2:4,b1:5,d1:6,_b1:7,_d1:8",
+               D4 => "b2:4,b1:5,d1:6,_d3:9,d3:10",
+               D5 => "b1:2,b2:4",
+               'Foo::Bar::Baz' => 'b1:1,b2:2,b3:3,foo:4,bar:5,baz:6',
+              );
+    $Total_tests += int(keys %expect);
+}
+my $testno = 0;
+while (my($class, $exp) = each %expect) {
+   no strict 'refs';
+   my $fstr = fstr(\%{$class."::FIELDS"});
+   ok( $fstr eq $exp, "'$fstr' eq '$exp'" );
+}
+
+# Did we get the appropriate amount of warnings?
+ok( $w == 1 );
+
+# A simple object creation and AVHV attribute access test
+my B2 $obj1 = D3->new;
+$obj1->{b1} = "B2";
+my D3 $obj2 = $obj1;
+$obj2->{b1} = "D3";
+
+ok( $obj1->[2] eq "B2" && $obj1->[5] eq "D3" );
+
+# We should get compile time failures field name typos
+eval q{ my D3 $obj3 = $obj2; $obj3->{notthere} = "" };
+ok( $@ && $@ =~ /^No such pseudo-hash field "notthere"/,
+                                 'compile error -- field name typos' );
+
+
+# Slices
+if( $] >= 5.006 ) {
+    @$obj1{"_b1", "b1"} = (17, 29);
+    ok( "@$obj1[1,2]" eq "17 29" );
+
+    @$obj1[1,2] = (44,28);
+    ok( "@$obj1{'b1','_b1','b1'}" eq "28 44 28" );
+}
+else {
+    ok( 1, 'test skipped for perl < 5.6.0' );
+    ok( 1, 'test skipped for perl < 5.6.0' );
+}
+
+my $ph = fields::phash(a => 1, b => 2, c => 3);
+ok( fstr($ph) eq 'a:1,b:2,c:3' );
+
+$ph = fields::phash([qw/a b c/], [1, 2, 3]);
+ok( fstr($ph) eq 'a:1,b:2,c:3' );
+
+# The way exists() works with psuedohashes changed from 5.005 to 5.6
+$ph = fields::phash([qw/a b c/], [1]);
+if( $] > 5.006 ) {
+    ok( !( exists $ph->{b} or exists $ph->{c} or !exists $ph->{a} ) );
+}
+else {
+    ok( !( defined $ph->{b} or defined $ph->{c} or !defined $ph->{a} ) );
+}
+
+eval { $ph = fields::phash("odd") };
+ok( $@ && $@ =~ /^Odd number of/ );
+
+
+# check if fields autovivify
+if ( $] > 5.006 ) {
+    package Foo;
+    use fields qw(foo bar);
+    sub new { bless [], $_[0]; }
+
+    package main;
+    my Foo $a = Foo->new();
+    $a->{foo} = ['a', 'ok', 'c'];
+    $a->{bar} = { A => 'ok' };
+    ok( $a->{foo}[1]   eq 'ok' );
+    ok( $a->{bar}->{A} eq 'ok' );
+}
+else {
+    ok( 1, 'test skipped for perl < 5.6.0' );
+    ok( 1, 'test skipped for perl < 5.6.0' );
+}
+
+# check if fields autovivify
+{
+    package Bar;
+    use fields qw(foo bar);
+    sub new { return fields::new($_[0]) }
+
+    package main;
+    my Bar $a = Bar::->new();
+    $a->{foo} = ['a', 'ok', 'c'];
+    $a->{bar} = { A => 'ok' };
+    ok( $a->{foo}[1]   eq 'ok' );
+    ok( $a->{bar}->{A} eq 'ok' );
+}
diff --git a/lib/base/t/fields-base.t b/lib/base/t/fields-base.t
new file mode 100644
index 0000000000..b5ab54f7cb
--- /dev/null
+++ b/lib/base/t/fields-base.t
@@ -0,0 +1,196 @@
+#!/usr/bin/perl -w
+
+my $Has_PH;
+BEGIN { 
+    $Has_PH = $] < 5.009;
+}
+
+my $W;
+
+BEGIN {
+    $W = 0;
+    $SIG{__WARN__} = sub {
+        if ($_[0] =~ /^Hides field '.*?' in base class/) {
+            $W++;
+        }
+        else {
+            warn $_[0];
+        }
+    };
+}
+
+use strict;
+use Test::More tests => 25;
+
+BEGIN { use_ok('base'); }
+
+package B1;
+use fields qw(b1 b2 b3);
+
+package B2;
+use fields '_b1';
+use fields qw(b1 _b2 b2);
+
+sub new { fields::new(shift) }
+
+package B3;
+use fields qw(b4 _b5 b6 _b7);
+
+package D1;
+use base 'B1';
+use fields qw(d1 d2 d3);
+
+package D2;
+use base 'B1';
+use fields qw(_d1 _d2);
+use fields qw(d1 d2);
+
+
+package D3;
+use base 'B2';
+use fields qw(b1 d1 _b1 _d1);  # hide b1
+
+package D4;
+use base 'D3';
+use fields qw(_d3 d3);
+
+package M;
+sub m {}
+
+package D5;
+use base qw(M B2);
+
+# Test that multiple inheritance fails.
+package D6;
+eval { 'base'->import(qw(B2 M B3)); };
+::like($@, qr/can't multiply inherit %FIELDS/i, 
+                                        'No multiple field inheritance');
+
+package Foo::Bar;
+use base 'B1';
+
+package Foo::Bar::Baz;
+use base 'Foo::Bar';
+use fields qw(foo bar baz);
+
+# Test repeatability for when modules get reloaded.
+package B1;
+use fields qw(b1 b2 b3);
+
+package D3;
+use base 'B2';
+use fields qw(b1 d1 _b1 _d1);  # hide b1
+
+
+# Test that a package with only private fields gets inherited properly
+package B7;
+use fields qw(_b1);
+
+package D7;
+use base qw(B7);
+use fields qw(b1);
+
+
+# Test that an intermediate package with no fields doesn't cause a problem.
+package B8;
+use fields qw(_b1);
+
+package D8;
+use base qw(B8);
+
+package D8A;
+use base qw(D8);
+use fields qw(b1);
+
+
+package main;
+
+my %EXPECT = (
+              B1 => [qw(b1 b2 b3)],
+              D1 => [qw(b1 b2 b3 d1 d2 d3)],
+              D2 => [qw(b1 b2 b3 _d1 _d2 d1 d2)],
+
+              M  => [qw()],
+              B2 => [qw(_b1 b1 _b2 b2)],
+              D3 => [(undef,undef,undef,
+                                qw(b2 b1 d1 _b1 _d1))],     # b1 is hidden
+              D4 => [(undef,undef,undef,
+                                qw(b2 b1 d1),undef,undef,qw(_d3 d3))],
+
+              D5 => [undef, 'b1', undef, 'b2'],
+
+              B3 => [qw(b4 _b5 b6 _b7)],
+
+              B7 => [qw(_b1)],
+              D7 => [undef, 'b1'],
+
+              B8  => [qw(_b1)],
+              D8  => [undef],
+              D8A => [undef, 'b1'],
+
+              'Foo::Bar'        => [qw(b1 b2 b3)],
+              'Foo::Bar::Baz'   => [qw(b1 b2 b3 foo bar baz)],
+             );
+
+while(my($class, $efields) = each %EXPECT) {
+    no strict 'refs';
+    my %fields = %{$class.'::FIELDS'};
+    my %expected_fields;
+    foreach my $idx (1..@$efields) {
+        my $key = $efields->[$idx-1];
+        next unless $key;
+        $expected_fields{$key} = $idx;
+    }
+
+    ::is_deeply(\%fields, \%expected_fields, "%FIELDS check:  $class");
+}
+
+# Did we get the appropriate amount of warnings?
+is( $W, 1, 'right warnings' );
+
+
+# A simple object creation and attribute access test
+my B2 $obj1 = D3->new;
+$obj1->{b1} = "B2";
+my D3 $obj2 = $obj1;
+$obj2->{b1} = "D3";
+
+# We should get compile time failures field name typos
+eval q(my D3 $obj3 = $obj2; $obj3->{notthere} = "");
+if( $Has_PH ) {
+    like $@, 
+      qr/^No such pseudo-hash field "notthere" in variable \$obj3 of type D3/;
+}
+else {
+    like $@, 
+      qr/^Attempt to access disallowed key 'notthere' in a restricted hash/;
+}
+
+# Slices
+@$obj1{"_b1", "b1"} = (17, 29);
+is( $obj1->{_b1}, 17 );
+is( $obj1->{b1},  29 );
+
+@$obj1{'_b1', 'b1'} = (44,28);
+is( $obj1->{_b1}, 44 );
+is( $obj1->{b1},  28 );
+
+
+
+# Break multiple inheritance with a field name clash.
+package E1;
+use fields qw(yo this _lah meep 42);
+
+package E2;
+use fields qw(_yo ahhh this);
+
+eval {
+    package Broken;
+
+    # The error must occur at run time for the eval to catch it.
+    require base;
+    'base'->import(qw(E1 E2));
+};
+::like( $@, qr/Can't multiply inherit %FIELDS/i, 'Again, no multi inherit' );
+
+
diff --git a/lib/base/t/fields.t b/lib/base/t/fields.t
new file mode 100644
index 0000000000..9ddae34c11
--- /dev/null
+++ b/lib/base/t/fields.t
@@ -0,0 +1,112 @@
+#!/usr/bin/perl -w
+
+my $Has_PH;
+BEGIN {
+    $Has_PH = $] < 5.009;
+}
+
+use strict;
+use Test::More tests => 16;
+
+BEGIN { use_ok('fields'); }
+
+
+package Foo;
+
+use fields qw(_no Pants who _up_yours);
+use fields qw(what);
+
+sub new { fields::new(shift) }
+sub magic_new { bless [] }  # Doesn't 100% work, perl's problem.
+
+package main;
+
+is_deeply( [sort keys %Foo::FIELDS], 
+           [sort qw(_no Pants who _up_yours what)]
+);
+
+sub show_fields {
+    my($base, $mask) = @_;
+    no strict 'refs';
+    my $fields = \%{$base.'::FIELDS'};
+    return grep { ($fields::attr{$base}[$fields->{$_}] & $mask) == $mask} 
+                keys %$fields;
+}
+
+is_deeply( [sort &show_fields('Foo', fields::PUBLIC)],
+           [sort qw(Pants who what)]);
+is_deeply( [sort &show_fields('Foo', fields::PRIVATE)],
+           [sort qw(_no _up_yours)]);
+
+# We should get compile time failures field name typos
+eval q(my Foo $obj = Foo->new; $obj->{notthere} = "");
+
+my $error = $Has_PH ? 'No such(?: [\w-]+)? field "notthere"'
+                    : q[Attempt to access disallowed key 'notthere' in a ].
+                      q[restricted hash at ];
+ok( $@ && $@ =~ /^$error/i );
+
+
+foreach (Foo->new) {
+    my Foo $obj = $_;
+    my %test = ( Pants => 'Whatever', _no => 'Yeah',
+                 what  => 'Ahh',      who => 'Moo',
+                 _up_yours => 'Yip' );
+
+    $obj->{Pants} = 'Whatever';
+    $obj->{_no}   = 'Yeah';
+    @{$obj}{qw(what who _up_yours)} = ('Ahh', 'Moo', 'Yip');
+
+    while(my($k,$v) = each %test) {
+        ok($obj->{$k} eq $v);
+    }
+}
+
+{
+    local $SIG{__WARN__} = sub {
+        return if $_[0] =~ /^Pseudo-hashes are deprecated/ 
+    };
+    my $phash;
+    eval { $phash = fields::phash(name => "Joe", rank => "Captain") };
+    if( $Has_PH ) {
+        is( $phash->{rank}, "Captain" );
+    }
+    else {
+        like $@, qr/^Pseudo-hashes have been removed from Perl/;
+    }
+}
+
+
+# check if fields autovivify
+{
+    package Foo::Autoviv;
+    use fields qw(foo bar);
+    sub new { fields::new($_[0]) }
+
+    package main;
+    my Foo::Autoviv $a = Foo::Autoviv->new();
+    $a->{foo} = ['a', 'ok', 'c'];
+    $a->{bar} = { A => 'ok' };
+    is( $a->{foo}[1],    'ok' );
+    is( $a->{bar}->{A},, 'ok' );
+}
+
+package Test::FooBar;
+
+use fields qw(a b c);
+
+sub new {
+    my $self = fields::new(shift);
+    %$self = @_ if @_;
+    $self;
+}
+
+package main;
+
+{
+    my $x = Test::FooBar->new( a => 1, b => 2);
+
+    is(ref $x, 'Test::FooBar', 'x is a Test::FooBar');
+    ok(exists $x->{a}, 'x has a');
+    ok(exists $x->{b}, 'x has b');
+}