Eliminate repetitious wording in perldiag

2 files changed, 3 insertions, 46 deletions

diff --git a/op.c b/op.c
index 04801842de..9d3d0fa65f 100644
--- a/op.c
+++ b/op.c
@@ -9971,7 +9971,6 @@ Perl_ck_fun(pTHX_ OP *o)
 		        )
 		    bad_type_pv(numargs, "array", o, kid);
 		else if (kid->op_type != OP_RV2AV && kid->op_type != OP_PADAV) {
-		    /* diag_listed_as: Experimental push on scalar is now forbidden */
                     yyerror_pv(Perl_form(aTHX_ "Experimental %s on scalar is now forbidden",
                                          PL_op_desc[type]), 0);
 		}
@@ -12043,7 +12042,6 @@ Perl_ck_each(pTHX_ OP *o)
 		    /* we let ck_fun handle it */
 		    break;
 	    default:
-                /* diag_listed_as: Experimental keys on scalar is now forbidden */
                 Perl_croak_nocontext(
                     "Experimental %s on scalar is now forbidden",
                     PL_op_desc[orig_type]);
diff --git a/pod/perldiag.pod b/pod/perldiag.pod
index 2723231553..71bf1ec87a 100644
--- a/pod/perldiag.pod
+++ b/pod/perldiag.pod
@@ -2115,39 +2115,10 @@ L<perlrecharclass/Extended Bracketed Character Classes>.
     use feature "signatures";
     sub foo ($left, $right) { ... }
 
-=item Experimental each on scalar is now forbidden
+=item Experimental %s on scalar is now forbidden
 
-(F) An experimental feature added in Perl 5.14 allowed C<each> to be called
-with a scalar argument. This experiment is considered unsuccessful, and has
-been removed. The C<postderef> feature may meet your needs better.
-
-=item Experimental keys on scalar is now forbidden
-
-(F) An experimental feature added in Perl 5.14 allowed C<keys> to be called
-with a scalar argument. This experiment is considered unsuccessful, and has
-been removed. The C<postderef> feature may meet your needs better.
-
-=item Experimental push on scalar is now forbidden
-
-(F) An experimental feature added in Perl 5.14 allowed C<push> to be called
-with a scalar argument. This experiment is considered unsuccessful, and has
-been removed. The C<postderef> feature may meet your needs better.
-
-=item Experimental pop on scalar is now forbidden
-
-(F) An experimental feature added in Perl 5.14 allowed C<pop> to be called
-with a scalar argument. This experiment is considered unsuccessful, and has
-been removed. The C<postderef> feature may meet your needs better.
-
-=item Experimental shift on scalar is now forbidden
-
-(F) An experimental feature added in Perl 5.14 allowed C<shift> to be called
-with a scalar argument. This experiment is considered unsuccessful, and has
-been removed. The C<postderef> feature may meet your needs better.
-
-=item Experimental splice on scalar is now forbidden
-
-(F) An experimental feature added in Perl 5.14 allowed C<splice> to be called
+(F) An experimental feature added in Perl 5.14 allowed C<each>, C<keys>,
+C<push>, C<pop>, C<shift>, C<splice>, C<unshift>, and C<values> to be called
 with a scalar argument. This experiment is considered unsuccessful, and has
 been removed. The C<postderef> feature may meet your needs better.
 
@@ -2159,18 +2130,6 @@ been removed. The C<postderef> feature may meet your needs better.
     use feature 'lexical_subs';
     my sub foo { ... }
 
-=item Experimental unshift on scalar is now forbidden
-
-(F) An experimental feature added in Perl 5.14 allowed C<unshift> to be called
-with a scalar argument. This experiment is considered unsuccessful, and has
-been removed. The C<postderef> feature may meet your needs better.
-
-=item Experimental values on scalar is now forbidden
-
-(F) An experimental feature added in Perl 5.14 allowed C<values> to be called
-with a scalar argument. This experiment is considered unsuccessful, and has
-been removed. The C<postderef> feature may meet your needs better.
-
 =item Explicit blessing to '' (assuming package main)
 
 (W misc) You are blessing a reference to a zero length string.  This has