A new version of the "remove UPPERACSE string comparison"

operators.  The problem with the previous one (change #6454)
was that it was for Perl 5.6.0.  From Paul Marquess.

p4raw-link: @6454 on //depot/perl: d164fe835174420df93c1795763a090dc6471f0a

p4raw-id: //depot/perl@6466

9 files changed, 171 insertions, 218 deletions

diff --git a/t/op/do.t b/t/op/do.t
index 87ec08d300..3fc44413d9 100755
--- a/t/op/do.t
+++ b/t/op/do.t
@@ -21,18 +21,18 @@ print "1..15\n";
 $_[0] = "not ok 1\n";
 $result = do foo1("ok 1\n");
 print "#2\t:$result: eq :value:\n";
-if ($result EQ 'value') { print "ok 2\n"; } else { print "not ok 2\n"; }
-if ($_[0] EQ "not ok 1\n") { print "ok 3\n"; } else { print "not ok 3\n"; }
+if ($result eq 'value') { print "ok 2\n"; } else { print "not ok 2\n"; }
+if ($_[0] eq "not ok 1\n") { print "ok 3\n"; } else { print "not ok 3\n"; }
 
 $_[0] = "not ok 4\n";
 $result = do foo2("not ok 4\n","ok 4\n","not ok 4\n");
 print "#5\t:$result: eq :value:\n";
-if ($result EQ 'value') { print "ok 5\n"; } else { print "not ok 5\n"; }
-if ($_[0] EQ "not ok 4\n") { print "ok 6\n"; } else { print "not ok 6\n"; }
+if ($result eq 'value') { print "ok 5\n"; } else { print "not ok 5\n"; }
+if ($_[0] eq "not ok 4\n") { print "ok 6\n"; } else { print "not ok 6\n"; }
 
 $result = do{print "ok 7\n"; 'value';};
 print "#8\t:$result: eq :value:\n";
-if ($result EQ 'value') { print "ok 8\n"; } else { print "not ok 8\n"; }
+if ($result eq 'value') { print "ok 8\n"; } else { print "not ok 8\n"; }
 
 sub blather {
     print @_;
diff --git a/t/pragma/warn/2use b/t/pragma/warn/2use
index b489d62e19..e25d43adbb 100644
--- a/t/pragma/warn/2use
+++ b/t/pragma/warn/2use
@@ -13,25 +13,25 @@ BEGIN failed--compilation aborted at - line 3.
 ########
 
 # Check compile time scope of pragma
-use warnings 'deprecated' ;
+use warnings 'syntax' ;
 {
     no warnings ;
-    1 if $a EQ $b ;
+    my $a =+ 1 ;
 }
-1 if $a EQ $b ;
+my $a =+ 1 ;
 EXPECT
-Use of EQ is deprecated at - line 8.
+Reversed += operator at - line 8.
 ########
 
 # Check compile time scope of pragma
 no warnings;
 {
-    use warnings 'deprecated' ;
-    1 if $a EQ $b ;
+    use warnings 'syntax' ;
+    my $a =+ 1 ;
 }
-1 if $a EQ $b ;
+my $a =+ 1 ;
 EXPECT
-Use of EQ is deprecated at - line 6.
+Reversed += operator at - line 6.
 ########
 
 # Check runtime scope of pragma
@@ -67,55 +67,55 @@ EXPECT
 Use of uninitialized value in scalar chop at - line 6.
 ########
 
-use warnings 'deprecated' ;
-1 if $a EQ $b ;
+use warnings 'syntax' ;
+my $a =+ 1 ;
 EXPECT
-Use of EQ is deprecated at - line 3.
+Reversed += operator at - line 3.
 ########
 
 --FILE-- abc
-1 if $a EQ $b ;
+my $a =+ 1 ;
 1;
 --FILE-- 
-use warnings 'deprecated' ;
+use warnings 'syntax' ;
 require "./abc";
 EXPECT
 
 ########
 
 --FILE-- abc
-use warnings 'deprecated' ;
+use warnings 'syntax' ;
 1;
 --FILE-- 
 require "./abc";
-1 if $a EQ $b ;
+my $a =+ 1 ;
 EXPECT
 
 ########
 
 --FILE-- abc
-use warnings 'deprecated' ;
-1 if $a EQ $b ;
+use warnings 'syntax' ;
+my $a =+ 1 ;
 1;
 --FILE-- 
 use warnings 'uninitialized' ;
 require "./abc";
 my $a ; chop $a ;
 EXPECT
-Use of EQ is deprecated at ./abc line 2.
+Reversed += operator at ./abc line 2.
 Use of uninitialized value in scalar chop at - line 3.
 ########
 
 --FILE-- abc.pm
-use warnings 'deprecated' ;
-1 if $a EQ $b ;
+use warnings 'syntax' ;
+my $a =+ 1 ;
 1;
 --FILE-- 
 use warnings 'uninitialized' ;
 use abc;
 my $a ; chop $a ;
 EXPECT
-Use of EQ is deprecated at abc.pm line 2.
+Reversed += operator at abc.pm line 2.
 Use of uninitialized value in scalar chop at - line 3.
 ########
 
@@ -179,9 +179,9 @@ use warnings;
 {
     no warnings ;
     eval {
-        1 if $a EQ $b ;
+        my $a =+ 1 ;
     }; print STDERR $@ ;
-    1 if $a EQ $b ;
+    my $a =+ 1 ;
 }
 EXPECT
 
@@ -192,41 +192,41 @@ use warnings;
 {
     no warnings ;
     eval {
-        use warnings 'deprecated' ;
-        1 if $a EQ $b ;
+        use warnings 'syntax' ;
+        my $a =+ 1 ;
     }; print STDERR $@ ;
-    1 if $a EQ $b ;
+    my $a =+ 1 ;
 }
 EXPECT
-Use of EQ is deprecated at - line 8.
+Reversed += operator at - line 8.
 ########
 
 # Check scope of pragma with eval
 no warnings;
 {
-    use warnings 'deprecated' ;
+    use warnings 'syntax' ;
     eval {
-        1 if $a EQ $b ;
+        my $a =+ 1 ;
     }; print STDERR $@ ;
-    1 if $a EQ $b ;
+    my $a =+ 1 ;
 }
 EXPECT
-Use of EQ is deprecated at - line 7.
-Use of EQ is deprecated at - line 9.
+Reversed += operator at - line 7.
+Reversed += operator at - line 9.
 ########
 
 # Check scope of pragma with eval
 no warnings;
 {
-    use warnings 'deprecated' ;
+    use warnings 'syntax' ;
     eval {
         no warnings ;
-        1 if $a EQ $b ;
+        my $a =+ 1 ;
     }; print STDERR $@ ;
-    1 if $a EQ $b ;
+    my $a =+ 1 ;
 }
 EXPECT
-Use of EQ is deprecated at - line 10.
+Reversed += operator at - line 10.
 ########
 
 # Check scope of pragma with eval
@@ -289,9 +289,9 @@ use warnings;
 {
     no warnings ;
     eval '
-        1 if $a EQ $b ;
+        my $a =+ 1 ;
     '; print STDERR $@ ;
-    1 if $a EQ $b ;
+    my $a =+ 1 ;
 }
 EXPECT
 
@@ -302,55 +302,53 @@ use warnings;
 {
     no warnings ;
     eval q[ 
-        use warnings 'deprecated' ;
-        1 if $a EQ $b ;
+        use warnings 'syntax' ;
+        my $a =+ 1 ;
     ]; print STDERR $@;
-    1 if $a EQ $b ;
+    my $a =+ 1 ;
 }
 EXPECT
-Use of EQ is deprecated at (eval 1) line 3.
+Reversed += operator at (eval 1) line 3.
 ########
 
 # Check scope of pragma with eval
 no warnings;
 {
-    use warnings 'deprecated' ;
+    use warnings 'syntax' ;
     eval '
-        1 if $a EQ $b ;
+        my $a =+ 1 ;
     '; print STDERR $@;
-    1 if $a EQ $b ;
+    my $a =+ 1 ;
 }
 EXPECT
-Use of EQ is deprecated at - line 9.
-Use of EQ is deprecated at (eval 1) line 2.
+Reversed += operator at - line 9.
+Reversed += operator at (eval 1) line 2.
 ########
 
 # Check scope of pragma with eval
 no warnings;
 {
-    use warnings 'deprecated' ;
+    use warnings 'syntax' ;
     eval '
         no warnings ;
-        1 if $a EQ $b ;
+        my $a =+ 1 ;
     '; print STDERR $@;
-    1 if $a EQ $b ;
+    my $a =+ 1 ;
 }
 EXPECT
-Use of EQ is deprecated at - line 10.
+Reversed += operator at - line 10.
 ########
 
 # Check the additive nature of the pragma
-1 if $a EQ $b ;
+my $a =+ 1 ;
 my $a ; chop $a ;
-use warnings 'deprecated' ;
-1 if $a EQ $b ;
+use warnings 'syntax' ;
+$a =+ 1 ;
 my $b ; chop $b ;
 use warnings 'uninitialized' ;
 my $c ; chop $c ;
-no warnings 'deprecated' ;
-1 if $a EQ $b ;
+no warnings 'syntax' ;
+$a =+ 1 ;
 EXPECT
-Use of EQ is deprecated at - line 6.
+Reversed += operator at - line 6.
 Use of uninitialized value in scalar chop at - line 9.
-Use of uninitialized value in string eq at - line 11.
-Use of uninitialized value in string eq at - line 11.
diff --git a/t/pragma/warn/3both b/t/pragma/warn/3both
index 335e1b26b7..a4d9ba806d 100644
--- a/t/pragma/warn/3both
+++ b/t/pragma/warn/3both
@@ -258,9 +258,9 @@ BEGIN {  $^W = 1 }
 {
     no warnings ;
     eval '
-        1 if $a EQ $b ;
+        my $a =+ 1 ;
     '; print STDERR $@ ;
-    1 if $a EQ $b ;
+    my $a =+ 1 ;
 }
 EXPECT
 
diff --git a/t/pragma/warn/4lint b/t/pragma/warn/4lint
index 56e3fabe2c..3f9a89790d 100644
--- a/t/pragma/warn/4lint
+++ b/t/pragma/warn/4lint
@@ -4,11 +4,11 @@ __END__
 -W
 # lint: check compile time $^W is zapped
 BEGIN { $^W = 0 ;}
-$a = $b = 1 ;
-$a = 1 if $a EQ $b ;
+$a = 1 ;
+$a =+ 1 ;
 close STDIN ; print STDIN "abc" ;
 EXPECT
-Use of EQ is deprecated at - line 5.
+Reversed += operator at - line 5.
 print() on closed filehandle main::STDIN at - line 6.
 ########
 -W
@@ -30,11 +30,11 @@ print() on closed filehandle main::STDIN at - line 5.
 -W
 # lint: check "no warnings" is zapped
 no warnings ;
-$a = $b = 1 ;
-$a = 1 if $a EQ $b ;
+$a = 1 ;
+$a =+ 1 ;
 close STDIN ; print STDIN "abc" ;
 EXPECT
-Use of EQ is deprecated at - line 5.
+Reversed += operator at - line 5.
 print() on closed filehandle main::STDIN at - line 6.
 ########
 -W
@@ -57,58 +57,58 @@ print() on closed filehandle main::STDIN at - line 5.
 ########
 -W
 --FILE-- abc.pm
-no warnings 'deprecated' ;
-my ($a, $b) = (0,0);
-1 if $a EQ $b ;
+no warnings 'syntax' ;
+my $a = 0;
+$a =+ 1 ;
 1;
 --FILE-- 
 no warnings 'uninitialized' ;
 use abc;
 my $a ; chop $a ;
 EXPECT
-Use of EQ is deprecated at abc.pm line 3.
+Reversed += operator at abc.pm line 3.
 Use of uninitialized value in scalar chop at - line 3.
 ########
 -W
 --FILE-- abc
-no warnings 'deprecated' ;
-my ($a, $b) = (0,0);
-1 if $a EQ $b ;
+no warnings 'syntax' ;
+my $a = 0;
+$a =+ 1 ;
 1;
 --FILE-- 
 no warnings 'uninitialized' ;
 require "./abc";
 my $a ; chop $a ;
 EXPECT
-Use of EQ is deprecated at ./abc line 3.
+Reversed += operator at ./abc line 3.
 Use of uninitialized value in scalar chop at - line 3.
 ########
 -W
 --FILE-- abc.pm
 BEGIN {$^W = 0}
-my ($a, $b) = (0,0);
-1 if $a EQ $b ;
+my $a = 0 ;
+$a =+ 1 ;
 1;
 --FILE-- 
 $^W = 0 ;
 use abc;
 my $a ; chop $a ;
 EXPECT
-Use of EQ is deprecated at abc.pm line 3.
+Reversed += operator at abc.pm line 3.
 Use of uninitialized value in scalar chop at - line 3.
 ########
 -W
 --FILE-- abc
 BEGIN {$^W = 0}
-my ($a, $b) = (0,0);
-1 if $a EQ $b ;
+my $a = 0 ;
+$a =+ 1 ;
 1;
 --FILE-- 
 $^W = 0 ;
 require "./abc";
 my $a ; chop $a ;
 EXPECT
-Use of EQ is deprecated at ./abc line 3.
+Reversed += operator at ./abc line 3.
 Use of uninitialized value in scalar chop at - line 3.
 ########
 -W
@@ -175,42 +175,42 @@ use warnings;
     my $a = "1"; my $b = "2";
     no warnings ;
     eval q[ 
-        use warnings 'deprecated' ;
-        1 if $a EQ $b ;
+        use warnings 'syntax' ;
+        $a =+ 1 ;
     ]; print STDERR $@;
-    1 if $a EQ $b ;
+    $a =+ 1 ;
 }
 EXPECT
-Use of EQ is deprecated at - line 11.
-Use of EQ is deprecated at (eval 1) line 3.
+Reversed += operator at - line 11.
+Reversed += operator at (eval 1) line 3.
 ########
 -W
 # Check scope of pragma with eval
 no warnings;
 {
     my $a = "1"; my $b = "2";
-    use warnings 'deprecated' ;
+    use warnings 'syntax' ;
     eval '
-        1 if $a EQ $b ;
+        $a =+ 1 ;
     '; print STDERR $@;
-    1 if $a EQ $b ;
+    $a =+ 1 ;
 }
 EXPECT
-Use of EQ is deprecated at - line 10.
-Use of EQ is deprecated at (eval 1) line 2.
+Reversed += operator at - line 10.
+Reversed += operator at (eval 1) line 2.
 ########
 -W
 # Check scope of pragma with eval
 no warnings;
 {
     my $a = "1"; my $b = "2";
-    use warnings 'deprecated' ;
+    use warnings 'syntax' ;
     eval '
         no warnings ;
-        1 if $a EQ $b ;
+        $a =+ 1 ;
     '; print STDERR $@;
-    1 if $a EQ $b ;
+    $a =+ 1 ;
 }
 EXPECT
-Use of EQ is deprecated at - line 11.
-Use of EQ is deprecated at (eval 1) line 3.
+Reversed += operator at - line 11.
+Reversed += operator at (eval 1) line 3.
diff --git a/t/pragma/warn/5nolint b/t/pragma/warn/5nolint
index 2459968003..56158a20be 100644
--- a/t/pragma/warn/5nolint
+++ b/t/pragma/warn/5nolint
@@ -1,11 +1,11 @@
-Check anti-lint
+syntax anti-lint
 
 __END__
 -X
 # nolint: check compile time $^W is zapped
 BEGIN { $^W = 1 ;}
 $a = $b = 1 ;
-$a = 1 if $a EQ $b ;
+$a =+ 1 ;
 close STDIN ; print STDIN "abc" ;
 EXPECT
 ########
@@ -27,7 +27,7 @@ EXPECT
 # nolint: check "no warnings" is zapped
 use warnings ;
 $a = $b = 1 ;
-$a = 1 if $a EQ $b ;
+$a =+ 1 ;
 close STDIN ; print STDIN "abc" ;
 EXPECT
 ########
@@ -49,9 +49,9 @@ EXPECT
 ########
 -X
 --FILE-- abc.pm
-use warnings 'deprecated' ;
-my ($a, $b) = (0,0);
-1 if $a EQ $b ;
+use warnings 'syntax' ;
+my $a = 0;
+$a =+ 1 ;
 1;
 --FILE-- 
 use warnings 'uninitialized' ;
@@ -61,9 +61,9 @@ EXPECT
 ########
 -X
 --FILE-- abc
-use warnings 'deprecated' ;
-my ($a, $b) = (0,0);
-1 if $a EQ $b ;
+use warnings 'syntax' ;
+my $a = 0;
+$a =+ 1 ;
 1;
 --FILE-- 
 use warnings 'uninitialized' ;
@@ -75,7 +75,7 @@ EXPECT
 --FILE-- abc.pm
 BEGIN {$^W = 1}
 my ($a, $b) = (0,0);
-1 if $a EQ $b ;
+$a =+ 1 ;
 1;
 --FILE-- 
 $^W = 1 ;
@@ -87,7 +87,7 @@ EXPECT
 --FILE-- abc
 BEGIN {$^W = 1}
 my ($a, $b) = (0,0);
-1 if $a EQ $b ;
+$a =+ 1 ;
 1;
 --FILE-- 
 $^W = 1 ;
@@ -155,9 +155,9 @@ use warnings;
 {
     no warnings ;
     eval '
-        1 if $a EQ $b ;
+        my $a =+ 1 ;
     '; print STDERR $@ ;
-    1 if $a EQ $b ;
+    my $a =+ 1 ;
 }
 EXPECT
 
@@ -168,10 +168,10 @@ use warnings;
 {
     no warnings ;
     eval q[ 
-        use warnings 'deprecated' ;
-        1 if $a EQ $b ;
+        use warnings 'syntax' ;
+        my $a =+ 1 ;
     ]; print STDERR $@;
-    1 if $a EQ $b ;
+    my $a =+ 1 ;
 }
 EXPECT
 
@@ -180,11 +180,11 @@ EXPECT
 # Check scope of pragma with eval
 no warnings;
 {
-    use warnings 'deprecated' ;
+    use warnings 'syntax' ;
     eval '
-        1 if $a EQ $b ;
+        my $a =+ 1 ;
     '; print STDERR $@;
-    1 if $a EQ $b ;
+    my $a =+ 1 ;
 }
 EXPECT
 
@@ -193,12 +193,12 @@ EXPECT
 # Check scope of pragma with eval
 no warnings;
 {
-    use warnings 'deprecated' ;
+    use warnings 'syntax' ;
     eval '
         no warnings ;
-        1 if $a EQ $b ;
+        my $a =+ 1 ;
     '; print STDERR $@;
-    1 if $a EQ $b ;
+    my $a =+ 1 ;
 }
 EXPECT
 
diff --git a/t/pragma/warn/7fatal b/t/pragma/warn/7fatal
index 2d29ddbd82..382a8458e5 100644
--- a/t/pragma/warn/7fatal
+++ b/t/pragma/warn/7fatal
@@ -3,27 +3,27 @@ Check FATAL functionality
 __END__
 
 # Check compile time warning
-use warnings FATAL => 'deprecated' ;
+use warnings FATAL => 'syntax' ;
 {
     no warnings ;
-    1 if $a EQ $b ;
+    $a =+ 1 ;
 }
-1 if $a EQ $b ; 
+$a =+ 1 ;
 print STDERR "The End.\n" ;
 EXPECT
-Use of EQ is deprecated at - line 8.
+Reversed += operator at - line 8.
 ########
 
 # Check compile time warning
 use warnings FATAL => 'all' ;
 {
     no warnings ;
-    1 if $a EQ $b ;
+    my $a =+ 1 ;
 }
-1 if $a EQ $b ; 
+my $a =+ 1 ;
 print STDERR "The End.\n" ;
 EXPECT
-Use of EQ is deprecated at - line 8.
+Reversed += operator at - line 8.
 ########
 
 # Check runtime scope of pragma
@@ -75,28 +75,28 @@ Use of uninitialized value in scalar chop at - line 6.
 ########
 
 --FILE-- abc
-1 if $a EQ $b ;
+$a =+ 1 ;
 1;
 --FILE-- 
-use warnings FATAL => 'deprecated' ;
+use warnings FATAL => 'syntax' ;
 require "./abc";
 EXPECT
 
 ########
 
 --FILE-- abc
-use warnings FATAL => 'deprecated' ;
+use warnings FATAL => 'syntax' ;
 1;
 --FILE-- 
 require "./abc";
-1 if $a EQ $b ;
+$a =+ 1 ;
 EXPECT
 
 ########
 
 --FILE-- abc
-use warnings 'deprecated' ;
-1 if $a EQ $b ;
+use warnings 'syntax' ;
+$a =+ 1 ;
 1;
 --FILE-- 
 use warnings FATAL => 'uninitialized' ;
@@ -104,13 +104,13 @@ require "./abc";
 my $a ; chop $a ;
 print STDERR "The End.\n" ;
 EXPECT
-Use of EQ is deprecated at ./abc line 2.
+Reversed += operator at ./abc line 2.
 Use of uninitialized value in scalar chop at - line 3.
 ########
 
 --FILE-- abc.pm
-use warnings 'deprecated' ;
-1 if $a EQ $b ;
+use warnings 'syntax' ;
+$a =+ 1 ;
 1;
 --FILE-- 
 use warnings FATAL => 'uninitialized' ;
@@ -118,7 +118,7 @@ use abc;
 my $a ; chop $a ;
 print STDERR "The End.\n" ;
 EXPECT
-Use of EQ is deprecated at abc.pm line 2.
+Reversed += operator at abc.pm line 2.
 Use of uninitialized value in scalar chop at - line 3.
 ########
 
@@ -162,44 +162,44 @@ Use of uninitialized value in scalar chop at - line 8.
 # Check scope of pragma with eval
 no warnings ;
 eval {
-    use warnings FATAL => 'deprecated' ;
-    1 if $a EQ $b ;
+    use warnings FATAL => 'syntax' ;
+    $a =+ 1 ;
 }; print STDERR "-- $@" ;
-1 if $a EQ $b ;
+$a =+ 1 ;
 print STDERR "The End.\n" ;
 EXPECT
-Use of EQ is deprecated at - line 6.
+Reversed += operator at - line 6.
 ########
 
 # Check scope of pragma with eval
-use warnings FATAL => 'deprecated' ;
+use warnings FATAL => 'syntax' ;
 eval {
-    1 if $a EQ $b ;
+    $a =+ 1 ;
 }; print STDERR "-- $@" ;
-1 if $a EQ $b ;
+$a =+ 1 ;
 print STDERR "The End.\n" ;
 EXPECT
-Use of EQ is deprecated at - line 5.
+Reversed += operator at - line 5.
 ########
 
 # Check scope of pragma with eval
-use warnings FATAL => 'deprecated' ;
+use warnings FATAL => 'syntax' ;
 eval {
     no warnings ;
-    1 if $a EQ $b ;
+    $a =+ 1 ;
 }; print STDERR $@ ;
-1 if $a EQ $b ;
+$a =+ 1 ;
 print STDERR "The End.\n" ;
 EXPECT
-Use of EQ is deprecated at - line 8.
+Reversed += operator at - line 8.
 ########
 
 # Check scope of pragma with eval
 no warnings ;
 eval {
-    use warnings FATAL => 'deprecated' ;
+    use warnings FATAL => 'syntax' ;
 }; print STDERR $@ ;
-1 if $a EQ $b ;
+$a =+ 1 ;
 print STDERR "The End.\n" ;
 EXPECT
 The End.
@@ -245,34 +245,34 @@ Use of uninitialized value in scalar chop at - line 8.
 # Check scope of pragma with eval
 no warnings ;
 eval q[ 
-    use warnings FATAL => 'deprecated' ;
-    1 if $a EQ $b ;
+    use warnings FATAL => 'syntax' ;
+    $a =+ 1 ;
 ]; print STDERR "-- $@";
-1 if $a EQ $b ;
+$a =+ 1 ;
 print STDERR "The End.\n" ;
 EXPECT
--- Use of EQ is deprecated at (eval 1) line 3.
+-- Reversed += operator at (eval 1) line 3.
 The End.
 ########
 
 # Check scope of pragma with eval
-use warnings FATAL => 'deprecated' ;
+use warnings FATAL => 'syntax' ;
 eval '
-    1 if $a EQ $b ;
+    $a =+ 1 ;
 '; print STDERR "-- $@";
 print STDERR "The End.\n" ;
 EXPECT
--- Use of EQ is deprecated at (eval 1) line 2.
+-- Reversed += operator at (eval 1) line 2.
 The End.
 ########
 
 # Check scope of pragma with eval
-use warnings FATAL => 'deprecated' ;
+use warnings FATAL => 'syntax' ;
 eval '
     no warnings ;
-    1 if $a EQ $b ;
+    $a =+ 1 ;
 '; print STDERR "-- $@";
-1 if $a EQ $b ;
+$a =+ 1 ;
 print STDERR "The End.\n" ;
 EXPECT
-Use of EQ is deprecated at - line 8.
+Reversed += operator at - line 8.
diff --git a/t/pragma/warn/8signal b/t/pragma/warn/8signal
index d480f1902a..cc1b9d926d 100644
--- a/t/pragma/warn/8signal
+++ b/t/pragma/warn/8signal
@@ -6,13 +6,13 @@ __END__
 # 8signal
 BEGIN { $| = 1; $SIG{__WARN__} = sub { print "WARN -- @_" } }
 BEGIN { $SIG{__DIE__}  = sub { print "DIE -- @_" } }
-1 if 1 EQ 2 ;
-use warnings qw(deprecated) ;
-1 if 1 EQ 2 ;
-use warnings FATAL => qw(deprecated) ;
-1 if 1 EQ 2 ;
+$a =+ 1 ;
+use warnings qw(syntax) ;
+$a =+ 1 ;
+use warnings FATAL => qw(syntax) ;
+$a =+ 1 ;
 print "The End.\n" ;
 EXPECT
-WARN -- Use of EQ is deprecated at - line 6.
-DIE -- Use of EQ is deprecated at - line 8.
-Use of EQ is deprecated at - line 8.
+WARN -- Reversed += operator at - line 6.
+DIE -- Reversed += operator at - line 8.
+Reversed += operator at - line 8.
diff --git a/t/pragma/warn/toke b/t/pragma/warn/toke
index 64f5368588..2c9433bd7d 100644
--- a/t/pragma/warn/toke
+++ b/t/pragma/warn/toke
@@ -3,12 +3,6 @@ toke.c	AOK
     we seem to have lost a few ambiguous warnings!!
 
  
-             	1 if $a EQ $b ;
-             	1 if $a NE $b ;
-             	1 if $a LT $b ;
-             	1 if $a GT $b ;
-             	1 if $a GE $b ;
-             	1 if $a LE $b ;
  		$a = <<;
  		Use of comma-less variable list is deprecated 
 		(called 3 times via depcom)
@@ -132,29 +126,6 @@ toke.c	AOK
 __END__
 # toke.c 
 use warnings 'deprecated' ;
-1 if $a EQ $b ;
-1 if $a NE $b ;
-1 if $a GT $b ;
-1 if $a LT $b ;
-1 if $a GE $b ;
-1 if $a LE $b ;
-no warnings 'deprecated' ;
-1 if $a EQ $b ;
-1 if $a NE $b ;
-1 if $a GT $b ;
-1 if $a LT $b ;
-1 if $a GE $b ;
-1 if $a LE $b ;
-EXPECT
-Use of EQ is deprecated at - line 3.
-Use of NE is deprecated at - line 4.
-Use of GT is deprecated at - line 5.
-Use of LT is deprecated at - line 6.
-Use of GE is deprecated at - line 7.
-Use of LE is deprecated at - line 8.
-########
-# toke.c
-use warnings 'deprecated' ;
 format STDOUT =
 @<<<  @|||  @>>>  @>>>
 $a    $b    "abc" 'def'
diff --git a/toke.c b/toke.c
index 130d5c4106..2887a211c8 100644
--- a/toke.c
+++ b/toke.c
@@ -5146,7 +5146,6 @@ Perl_keyword(pTHX_ register char *d, I32 len)
 	}
 	break;
     case 'E':
-	if (strEQ(d,"EQ")) { deprecate(d);	return -KEY_eq;}
 	if (strEQ(d,"END"))			return KEY_END;
 	break;
     case 'e':
@@ -5212,12 +5211,6 @@ Perl_keyword(pTHX_ register char *d, I32 len)
 	    break;
 	}
 	break;
-    case 'G':
-	if (len == 2) {
-	    if (strEQ(d,"GT")) { deprecate(d);	return -KEY_gt;}
-	    if (strEQ(d,"GE")) { deprecate(d);	return -KEY_ge;}
-	}
-	break;
     case 'g':
 	if (strnEQ(d,"get",3)) {
 	    d += 3;
@@ -5317,12 +5310,6 @@ Perl_keyword(pTHX_ register char *d, I32 len)
 	    if (strEQ(d,"kill"))		return -KEY_kill;
 	}
 	break;
-    case 'L':
-	if (len == 2) {
-	    if (strEQ(d,"LT")) { deprecate(d);	return -KEY_lt;}
-	    if (strEQ(d,"LE")) { deprecate(d);	return -KEY_le;}
-	}
-	break;
     case 'l':
 	switch (len) {
 	case 2:
@@ -5374,9 +5361,6 @@ Perl_keyword(pTHX_ register char *d, I32 len)
 	    break;
 	}
 	break;
-    case 'N':
-	if (strEQ(d,"NE")) { deprecate(d);	return -KEY_ne;}
-	break;
     case 'n':
 	if (strEQ(d,"next"))			return KEY_next;
 	if (strEQ(d,"ne"))			return -KEY_ne;