Adapted for changed sieve diagnostics format.

@@ -18,22 +18,22 @@
 
 sieve_test addr_is_all.sv -pattern \
 "DISCARD on msg uid 1: marking as deleted"\
-"KEEP on msg uid 2"\
-"KEEP on msg uid 3"
+"IMPLICIT KEEP on msg uid 2"\
+"IMPLICIT KEEP on msg uid 3"
 
 sieve_test addr_is_domain.sv -pattern \
 "DISCARD on msg uid 1: marking as deleted"\
-"KEEP on msg uid 2"\
-"KEEP on msg uid 3"
+"IMPLICIT KEEP on msg uid 2"\
+"IMPLICIT KEEP on msg uid 3"
 
 sieve_test addr_is_local.sv -pattern \
-"KEEP on msg uid 1"\
+"IMPLICIT KEEP on msg uid 1"\
 "DISCARD on msg uid 2: marking as deleted"\
-"KEEP on msg uid 3"
+"IMPLICIT KEEP on msg uid 3"
 
 sieve_test addr_matches.sv -pattern \
-"KEEP on msg uid 1"\
+"IMPLICIT KEEP on msg uid 1"\
 "DISCARD on msg uid 2: marking as deleted"\
-"KEEP on msg uid 3"
+"IMPLICIT KEEP on msg uid 3"
 
 # end of address.exp

@@ -17,14 +17,14 @@
 # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
 
 sieve_test allof00.sv -pattern \
-"KEEP on msg uid 1"\
-"KEEP on msg uid 2"\
-"KEEP on msg uid 3"
+"IMPLICIT KEEP on msg uid 1"\
+"IMPLICIT KEEP on msg uid 2"\
+"IMPLICIT KEEP on msg uid 3"
 
 sieve_test allof01.sv -pattern \
-"KEEP on msg uid 1"\
-"KEEP on msg uid 2"\
-"KEEP on msg uid 3"
+"IMPLICIT KEEP on msg uid 1"\
+"IMPLICIT KEEP on msg uid 2"\
+"IMPLICIT KEEP on msg uid 3"
 
 sieve_test allof11.sv -pattern \
 "DISCARD on msg uid 1: marking as deleted"\

@@ -17,9 +17,9 @@
 # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
 
 sieve_test anyof00.sv -pattern \
-"KEEP on msg uid 1"\
-"KEEP on msg uid 2"\
-"KEEP on msg uid 3"
+"IMPLICIT KEEP on msg uid 1"\
+"IMPLICIT KEEP on msg uid 2"\
+"IMPLICIT KEEP on msg uid 3"
 
 sieve_test anyof01.sv -pattern \
 "DISCARD on msg uid 1: marking as deleted"\

@@ -18,7 +18,7 @@
 
 sieve_test envelope1.sv -pattern \
 "DISCARD on msg uid 1: marking as deleted"\
-"KEEP on msg uid 2"\
-"KEEP on msg uid 3"
+"IMPLICIT KEEP on msg uid 2"\
+"IMPLICIT KEEP on msg uid 3"
 
 # end of envelope.exp

@@ -18,17 +18,17 @@
 
 sieve_test exists1.sv -pattern \
 "DISCARD on msg uid 1: marking as deleted"\
-"KEEP on msg uid 2"\
-"KEEP on msg uid 3"
+"IMPLICIT KEEP on msg uid 2"\
+"IMPLICIT KEEP on msg uid 3"
 
 sieve_test exists2.sv -pattern \
 "DISCARD on msg uid 1: marking as deleted"\
-"KEEP on msg uid 2"\
-"KEEP on msg uid 3"
+"IMPLICIT KEEP on msg uid 2"\
+"IMPLICIT KEEP on msg uid 3"
 
 sieve_test exists3.sv -pattern \
-"KEEP on msg uid 1"\
-"KEEP on msg uid 2"\
-"KEEP on msg uid 3"
+"IMPLICIT KEEP on msg uid 1"\
+"IMPLICIT KEEP on msg uid 2"\
+"IMPLICIT KEEP on msg uid 3"
 
 # end of exists.exp

@@ -17,8 +17,8 @@
 # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
 
 sieve_test false.sv -pattern \
-"KEEP on msg uid 1"\
-"KEEP on msg uid 2"\
-"KEEP on msg uid 3"
+"IMPLICIT KEEP on msg uid 1"\
+"IMPLICIT KEEP on msg uid 2"\
+"IMPLICIT KEEP on msg uid 3"
 
 # end of false.exp

@@ -18,17 +18,17 @@
 
 sieve_test header1.sv -pattern \
 "DISCARD on msg uid 1: marking as deleted"\
-"KEEP on msg uid 2"\
-"KEEP on msg uid 3"
+"IMPLICIT KEEP on msg uid 2"\
+"IMPLICIT KEEP on msg uid 3"
 
 sieve_test header2.sv -pattern \
 "DISCARD on msg uid 1: marking as deleted"\
-"KEEP on msg uid 2"\
+"IMPLICIT KEEP on msg uid 2"\
 "DISCARD on msg uid 3: marking as deleted"
 
 sieve_test header3.sv -pattern \
-"KEEP on msg uid 1"\
+"IMPLICIT KEEP on msg uid 1"\
 "DISCARD on msg uid 2: marking as deleted"\
-"KEEP on msg uid 3"
+"IMPLICIT KEEP on msg uid 3"
 
 # end of header.exp

@@ -17,13 +17,13 @@
 # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
 
 sieve_test size1.sv -pattern \
-"KEEP on msg uid 1"\
-"KEEP on msg uid 2"\
+"IMPLICIT KEEP on msg uid 1"\
+"IMPLICIT KEEP on msg uid 2"\
 "DISCARD on msg uid 3: marking as deleted"
 
 sieve_test size2.sv -pattern \
 "DISCARD on msg uid 1: marking as deleted"\
 "DISCARD on msg uid 2: marking as deleted"\
-"KEEP on msg uid 3"
+"IMPLICIT KEEP on msg uid 3"
 
 # end of size.exp