[perl #122110] [PATCH] Remove left-over mad cruft

The great MADectomy left some cruft behind:

    - no_index in META.{yml,json}
    - $Config{mad} checks in tests
    - Porting/perlhist_calculate.pl
    - symbian/config.pl
    - PERL_XMLDUMP error in perldiag
    - madly{h,obj,src} in win32/config.{gc,vc}

diff --git a/META.json b/META.json
index 2d45bd9..4cd8b17 100644 (file)
--- a/META.json
+++ b/META.json
@@ -56,7 +56,6 @@
          "dist/threads-shared",
          "dist/Tie-File",
          "dist/XSLoader",
-         "mad",
          "win32"
       ],
       "file" : [

diff --git a/META.yml b/META.yml
index 3763fe5..ce19e60 100644 (file)
--- a/META.yml
+++ b/META.yml
@@ -54,7 +54,6 @@ no_index:
     - dist/threads-shared
     - dist/Tie-File
     - dist/XSLoader
-    - mad
     - win32
   file:
     - autodoc.pl

diff --git a/Porting/makemeta b/Porting/makemeta
index 8d0b069..6981048 100644 (file)
--- a/Porting/makemeta
+++ b/Porting/makemeta
@@ -70,7 +70,7 @@ my @CPAN  = grep { $Modules{$_}{CPAN} } keys %Modules;
 my @files = ('autodoc.pl', 'lib/unicore/mktables', 'TestInit.pm',
              'Porting/Maintainers.pm', 'Porting/perldelta_template.pod',
              map { get_module_files($_) } @CPAN);
-my @dirs  = ('cpan', 'win32', 'mad', grep { -d $_ && $_  !~ /^cpan/ } map { get_module_pat($_) } @CPAN);
+my @dirs  = ('cpan', 'win32', grep { -d $_ && $_  !~ /^cpan/ } map { get_module_pat($_) } @CPAN);
 
 my %dirs;
 @dirs{@dirs} = ();

diff --git a/Porting/perlhist_calculate.pl b/Porting/perlhist_calculate.pl
index 0d73991..661f98d 100755 (executable)
--- a/Porting/perlhist_calculate.pl
+++ b/Porting/perlhist_calculate.pl
@@ -143,7 +143,7 @@ sub calc_longtable {
 
        emit Configure => $configure_size, 1;
 
-       foreach my $dir (qw(Cross djgpp emacs h2pl hints mad NetWare os2 plan9 Porting qnx symbian utils vms vos win32 x2p)) {
+       foreach my $dir (qw(Cross djgpp emacs h2pl hints NetWare os2 plan9 Porting qnx symbian utils vms vos win32 x2p)) {
                calc_dir($dir);
        }
 }

diff --git a/pod/perldiag.pod b/pod/perldiag.pod
index 5459af0..67524bd 100644 (file)
--- a/pod/perldiag.pod
+++ b/pod/perldiag.pod
@@ -1026,12 +1026,6 @@ grep().  You can usually double the curlies to get the same effect
 though, because the inner curlies will be considered a block that loops
 once.  See L<perlfunc/next>.
 
-=item Can't open %s
-
-(F) You tried to run a perl built with MAD support with
-the PERL_XMLDUMP environment variable set, but the file
-named by that variable could not be opened.
-
 =item Can't open %s: %s
 
 (S inplace) The implicit opening of a file through use of the C<< <> >>

diff --git a/symbian/config.pl b/symbian/config.pl
index ab739fe..e82c365 100644 (file)
--- a/symbian/config.pl
+++ b/symbian/config.pl
@@ -112,7 +112,6 @@ __EOF__
         @c = map  { glob } qw(*.c);       # Find the .c files.
         @c = map  { lc } @c;              # Lowercase the names.
         @c = grep { !/malloc\.c/ } @c;    # Use the system malloc.
-        @c = grep { !/madly\.c/ } @c;     # mad is undef.
         @c = grep { !/main\.c/ } @c;      # main.c must be explicit.
         push @c, map { lc } @x;
         @c = map { s:^\.\./::; $_ } @c;    # Remove the leading ../

diff --git a/t/op/incfilter.t b/t/op/incfilter.t
index c344558..905d819 100644 (file)
--- a/t/op/incfilter.t
+++ b/t/op/incfilter.t
@@ -173,10 +173,7 @@ BEGIN {prepend_block_counting_filter};
 pas("SSS make s fast SSS");
 EOC
 
-TODO: {
-    todo_skip "disabled under -Dmad", 50 if $Config{mad};
-    do [$fh, sub {s/s/ss/gs; s/([\nS])/$1$1$1/gs; return;}] or die;
-}
+do [$fh, sub {s/s/ss/gs; s/([\nS])/$1$1$1/gs; return;}] or die;
 
 sub prepend_line_counting_filter {
     filter_add(sub {

diff --git a/t/re/pat_re_eval.t b/t/re/pat_re_eval.t
index d64cb28..309d0e9 100644 (file)
--- a/t/re/pat_re_eval.t
+++ b/t/re/pat_re_eval.t
@@ -627,29 +627,22 @@ sub run_tests {
        }
 
        # and make sure things are freed at the right time
-
-        SKIP: {
-            if ($Config{mad}) {
-                skip "MAD doesn't free eval CVs", 3;
-           }
-
+       {
+           sub Foo99::DESTROY { $Foo99::d++ }
+           $Foo99::d = 0;
+           my $r1;
            {
-               sub Foo99::DESTROY { $Foo99::d++ }
-               $Foo99::d = 0;
-               my $r1;
-               {
-                   my $x = bless [1], 'Foo99';
-                   $r1 = eval 'qr/(??{$x->[0]})/';
-               }
-               my $r2 = eval 'qr/a$r1/';
-               my $x = 2;
-               ok(eval '"a1" =~ qr/^$r2$/', "match while in scope");
-               # make sure PL_reg_curpm isn't holding on to anything
-               "a" =~ /a(?{1})/;
-               is($Foo99::d, 0, "before scope exit");
+               my $x = bless [1], 'Foo99';
+               $r1 = eval 'qr/(??{$x->[0]})/';
            }
-           ::is($Foo99::d, 1, "after scope exit");
+           my $r2 = eval 'qr/a$r1/';
+           my $x = 2;
+           ok(eval '"a1" =~ qr/^$r2$/', "match while in scope");
+           # make sure PL_reg_curpm isn't holding on to anything
+           "a" =~ /a(?{1})/;
+           is($Foo99::d, 0, "before scope exit");
        }
+       ::is($Foo99::d, 1, "after scope exit");
 
        # forward declared subs should Do The Right Thing with any anon CVs
        # within them (i.e. pad_fixup_inner_anons() should work)

diff --git a/win32/config.gc b/win32/config.gc
index 3150e4a..11b490e 100644 (file)
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -797,9 +797,6 @@ ls='dir'
 lseeksize='4'
 lseektype='long'
 mad='undef'
-madlyh=''
-madlyobj=''
-madlysrc=''
 mail=''
 mailx=''
 make='dmake'

diff --git a/win32/config.vc b/win32/config.vc
index d7f67d0..d4b0b83 100644 (file)
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -796,9 +796,6 @@ ls='dir'
 lseeksize='4'
 lseektype='long'
 mad='undef'
-madlyh=''
-madlyobj=''
-madlysrc=''
 mail=''
 mailx=''
 make='nmake'