import perl 5.16.3 from CPAN - worked on by Andrew Fresh and myself

1 files changed, 15 insertions, 14 deletions

diff --git a/gnu/usr.bin/perl/cpan/Test-Harness/t/lib/TAP/Parser/SubclassTest.pm b/gnu/usr.bin/perl/cpan/Test-Harness/t/lib/TAP/Parser/SubclassTest.pm
index 84becee932c..8772dfd61fb 100644
--- a/gnu/usr.bin/perl/cpan/Test-Harness/t/lib/TAP/Parser/SubclassTest.pm
+++ b/gnu/usr.bin/perl/cpan/Test-Harness/t/lib/TAP/Parser/SubclassTest.pm
@@ -8,25 +8,26 @@ use vars qw(@ISA);
 use TAP::Parser;
 
 use MyCustom;
-use MySource;
-use MyPerlSource;
+use MySourceHandler;
+use MyPerlSourceHandler;
 use MyGrammar;
-use MyIteratorFactory;
 use MyResultFactory;
 
 @ISA = qw( TAP::Parser MyCustom );
 
-sub _default_source_class           {'MySource'}
-sub _default_perl_source_class      {'MyPerlSource'}
-sub _default_grammar_class          {'MyGrammar'}
-sub _default_iterator_factory_class {'MyIteratorFactory'}
-sub _default_result_factory_class   {'MyResultFactory'}
-
-sub make_source      { shift->SUPER::make_source(@_)->custom }
-sub make_perl_source { shift->SUPER::make_perl_source(@_)->custom }
-sub make_grammar     { shift->SUPER::make_grammar(@_)->custom }
-sub make_iterator    { shift->SUPER::make_iterator(@_)->custom }
-sub make_result      { shift->SUPER::make_result(@_)->custom }
+sub _default_source_class         {'MySourceHandler'}        # deprecated
+sub _default_perl_source_class    {'MyPerlSourceHandler'}    # deprecated
+sub _default_grammar_class        {'MyGrammar'}
+sub _default_result_factory_class {'MyResultFactory'}
+
+sub make_source { shift->SUPER::make_source(@_)->custom }    # deprecated
+
+sub make_perl_source {
+    shift->SUPER::make_perl_source(@_)->custom;
+}                                                            # deprecated
+sub make_grammar  { shift->SUPER::make_grammar(@_)->custom }
+sub make_iterator { shift->SUPER::make_iterator(@_)->custom }    # deprecated
+sub make_result   { shift->SUPER::make_result(@_)->custom }
 
 sub _initialize {
     my $self = shift;