Replaced [imap4d_uidvalidity] with simple regexp.

@@ -21,7 +21,7 @@ imap4d_auth "user!passwd" "guessme"
 imap4d_test "EXAMINE INBOX"\
 "95 EXISTS"\
 "95 RECENT"\
--re "OK \\\[UIDVALIDITY [imap4d_uidvalidity]\\\] UID valididy status"\
+-re {OK \[UIDVALIDITY [0-9]+\] UID valididy status}\
 "OK \[UIDNEXT 96\] Predicted next uid"\
 "OK \[UNSEEN 1\] first unseen messsage"\
 "FLAGS (\\Answered \\Flagged \\Deleted \\Seen \\Draft)"\
@@ -31,7 +31,7 @@ imap4d_test "EXAMINE INBOX"\
 imap4d_test "SELECT INBOX"\
 "95 EXISTS"\
 "95 RECENT"\
--re "OK \\\[UIDVALIDITY [imap4d_uidvalidity]\\\] UID valididy status"\
+-re {OK \[UIDVALIDITY [0-9]+\] UID valididy status}\
 "OK \[UIDNEXT 96\] Predicted next uid"\
 "OK \[UNSEEN 1\] first unseen messsage "\
 "FLAGS (\\Answered \\Flagged \\Deleted \\Seen \\Draft)"\
@@ -39,7 +39,7 @@ imap4d_test "SELECT INBOX"\
 "OK \[READ-WRITE\] SELECT Completed"
 
 imap4d_test "STATUS INBOX (MESSAGES RECENT UNSEEN UIDVALIDITY UIDNEXT)" \
--re "STATUS INBOX \\(MESSAGES 95 RECENT 95 UNSEEN 95 UIDVALIDITY [imap4d_uidvalidity] UIDNEXT 96 \\)" \
+-re {STATUS INBOX \(MESSAGES 95 RECENT 95 UNSEEN 95 UIDVALIDITY [0-9]+ UIDNEXT 96 \)} \
 "OK"
 
 imap4d_test "STATUS mbox1 (MESSAGES RECENT UNSEEN UIDNEXT)" \
@@ -49,7 +49,7 @@ imap4d_test "STATUS mbox1 (MESSAGES RECENT UNSEEN UIDNEXT)" \
 imap4d_test "EXAMINE mbox1" \
 "4 EXISTS"\
 "4 RECENT"\
--re "OK \\\[UIDVALIDITY [imap4d_uidvalidity]\\\] UID valididy status"\
+-re {OK \[UIDVALIDITY [0-9]+\] UID valididy status}\
 "OK \[UIDNEXT 5\] Predicted next uid"\
 "OK \[UNSEEN 1\] first unseen messsage"\
 "FLAGS (\\Answered \\Flagged \\Deleted \\Seen \\Draft)"\

@@ -34,7 +34,7 @@ imap4d_auth "user!passwd" "guessme"
 imap4d_test "SELECT mbox1" \
 "4 EXISTS"\
 "4 RECENT"\
--re "OK \\\[UIDVALIDITY [imap4d_uidvalidity]\\\] UID valididy status"\
+-re {OK \[UIDVALIDITY [0-9]+\] UID valididy status}\
 "OK \[UIDNEXT 5\] Predicted next uid"\
 "OK \[UNSEEN 1\] first unseen messsage"\
 "FLAGS (\\Answered \\Flagged \\Deleted \\Seen \\Draft)"\
@@ -66,20 +66,20 @@ imap4d_test "FETCH 3 (FLAGS INTERNALDATE UID)"\
 #                fields as necessary.
 
 imap4d_test "FETCH 1:* ENVELOPE"\
-"1 FETCH (ENVELOPE (\"Fri, 28 Dec 2001 22:18:08 +0200\" \"Jabberwocky\"((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\"))  ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((NIL NIL \"NIL\" NIL)) ((NIL NIL \"NIL\" NIL)) NIL \"<200112282018.fBSKI8N04906@nonexistent.net>\"))"\
-"2 FETCH (ENVELOPE (\"Fri, 28 Dec 2001 23:28:08 +0200\" \"Re: Jabberwocky\"((\"Bar\" NIL \"bar\" \"dontmailme.org\"))  ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((NIL NIL \"NIL\" NIL)) ((NIL NIL \"NIL\" NIL)) NIL \"<200112232808.fERKR9N16790@dontmailme.org>\"))"\
-"3 FETCH (ENVELOPE (\"Sat, 13 Jul 2002 00:43:18 +0300\" \"Simple MIME\"((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\"))  ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((NIL NIL \"NIL\" NIL)) ((NIL NIL \"NIL\" NIL)) NIL \"<200207122143.g6CLhIb05086@Mirddin.farlep.net>\"))"\
-"4 FETCH (ENVELOPE (\"Sat, 13 Jul 2002 00:50:58 +0300\" \"Nested MIME\"((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\"))  ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((NIL NIL \"NIL\" NIL)) ((NIL NIL \"NIL\" NIL)) NIL \"<200207122150.g6CLowb05126@Mirddin.farlep.net>\"))"\
+"1 FETCH (ENVELOPE (\"Fri, 28 Dec 2001 22:18:08 +0200\" \"Jabberwocky\" ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((NIL NIL \"NIL\" NIL)) ((NIL NIL \"NIL\" NIL)) NIL \"<200112282018.fBSKI8N04906@nonexistent.net>\"))"\
+"2 FETCH (ENVELOPE (\"Fri, 28 Dec 2001 23:28:08 +0200\" \"Re: Jabberwocky\" ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((NIL NIL \"NIL\" NIL)) ((NIL NIL \"NIL\" NIL)) NIL \"<200112232808.fERKR9N16790@dontmailme.org>\"))"\
+"3 FETCH (ENVELOPE (\"Sat, 13 Jul 2002 00:43:18 +0300\" \"Simple MIME\" ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((NIL NIL \"NIL\" NIL)) ((NIL NIL \"NIL\" NIL)) NIL \"<200207122143.g6CLhIb05086@Mirddin.farlep.net>\"))"\
+"4 FETCH (ENVELOPE (\"Sat, 13 Jul 2002 00:50:58 +0300\" \"Nested MIME\" ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((NIL NIL \"NIL\" NIL)) ((NIL NIL \"NIL\" NIL)) NIL \"<200207122150.g6CLowb05126@Mirddin.farlep.net>\"))"\
 "OK"
 
 # ALL            Macro equivalent to: (FLAGS INTERNALDATE
 #                RFC822.SIZE ENVELOPE)
 
 imap4d_test "FETCH 1:\* ALL"\
-"1 FETCH (FLAGS (\\Recent) INTERNALDATE \"28-Dec-2001 23:18:09 +0000\" RFC822.SIZE 1299 ENVELOPE (\"Fri, 28 Dec 2001 22:18:08 +0200\" \"Jabberwocky\"((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\"))  ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((NIL NIL \"NIL\" NIL)) ((NIL NIL \"NIL\" NIL)) NIL \"<200112282018.fBSKI8N04906@nonexistent.net>\"))"\
-"2 FETCH (FLAGS (\\Recent) INTERNALDATE \"29-Dec-2001 00:28:09 +0000\" RFC822.SIZE 548 ENVELOPE (\"Fri, 28 Dec 2001 23:28:08 +0200\" \"Re: Jabberwocky\"((\"Bar\" NIL \"bar\" \"dontmailme.org\"))  ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((NIL NIL \"NIL\" NIL)) ((NIL NIL \"NIL\" NIL)) NIL \"<200112232808.fERKR9N16790@dontmailme.org>\"))"\
-"3 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:43:18 +0000\" RFC822.SIZE 1668 ENVELOPE (\"Sat, 13 Jul 2002 00:43:18 +0300\" \"Simple MIME\"((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\"))  ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((NIL NIL \"NIL\" NIL)) ((NIL NIL \"NIL\" NIL)) NIL \"<200207122143.g6CLhIb05086@Mirddin.farlep.net>\"))"\
-"4 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:50:58 +0000\" RFC822.SIZE 3568 ENVELOPE (\"Sat, 13 Jul 2002 00:50:58 +0300\" \"Nested MIME\"((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\"))  ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((NIL NIL \"NIL\" NIL)) ((NIL NIL \"NIL\" NIL)) NIL \"<200207122150.g6CLowb05126@Mirddin.farlep.net>\"))"\
+"1 FETCH (FLAGS (\\Recent) INTERNALDATE \"28-Dec-2001 23:18:09 +0000\" RFC822.SIZE 1299 ENVELOPE (\"Fri, 28 Dec 2001 22:18:08 +0200\" \"Jabberwocky\" ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((NIL NIL \"NIL\" NIL)) ((NIL NIL \"NIL\" NIL)) NIL \"<200112282018.fBSKI8N04906@nonexistent.net>\"))"\
+"2 FETCH (FLAGS (\\Recent) INTERNALDATE \"29-Dec-2001 00:28:09 +0000\" RFC822.SIZE 548 ENVELOPE (\"Fri, 28 Dec 2001 23:28:08 +0200\" \"Re: Jabberwocky\" ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((NIL NIL \"NIL\" NIL)) ((NIL NIL \"NIL\" NIL)) NIL \"<200112232808.fERKR9N16790@dontmailme.org>\"))"\
+"3 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:43:18 +0000\" RFC822.SIZE 1668 ENVELOPE (\"Sat, 13 Jul 2002 00:43:18 +0300\" \"Simple MIME\" ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((NIL NIL \"NIL\" NIL)) ((NIL NIL \"NIL\" NIL)) NIL \"<200207122143.g6CLhIb05086@Mirddin.farlep.net>\"))"\
+"4 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:50:58 +0000\" RFC822.SIZE 3568 ENVELOPE (\"Sat, 13 Jul 2002 00:50:58 +0300\" \"Nested MIME\" ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((NIL NIL \"NIL\" NIL)) ((NIL NIL \"NIL\" NIL)) NIL \"<200207122150.g6CLowb05126@Mirddin.farlep.net>\"))"\
 "OK"
 
 # BODYSTRUCTURE  The [MIME-IMB] body structure of the message.  This
@@ -501,7 +501,7 @@ imap4d_test "FETCH 1 FAST" \
 #                RFC822.SIZE ENVELOPE BODY)
 
 imap4d_test "FETCH 4 FULL"\
-"4 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:50:58 +0000\" RFC822.SIZE 3568 ENVELOPE (\"Sat, 13 Jul 2002 00:50:58 +0300\" \"Nested MIME\"((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\"))  ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((NIL NIL \"NIL\" NIL)) ((NIL NIL \"NIL\" NIL)) NIL \"<200207122150.g6CLowb05126@Mirddin.farlep.net>\") BODY ((\"text\" \"plain\" (\"name\" \"msg.21\" \"charset\" \"us-ascii\") \"<5122.1026510654.2@Mirddin.farlep.net>\" \"Father William Part I\" 7BIT 353 11)((\"application\" \"octet-stream\" (\"name\" \"msg.22\") \"<5122.1026510654.4@Mirddin.farlep.net>\" \"Father William Part II\" \"base64\" 488)((\"application\" \"octet-stream\" (\"name\" \"msg.23\") \"<5122.1026510654.6@Mirddin.farlep.net>\" \"Father William Part III\" \"base64\" 492)(\"application\" \"octet-stream\" (\"name\" \"msg.24\") \"<5122.1026510654.7@Mirddin.farlep.net>\" \"Father William Part IV\" \"base64\" 504) \"mixed\" NIL NIL NIL) \"mixed\" NIL NIL NIL) \"mixed\" NIL NIL NIL))"\
+"4 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:50:58 +0000\" RFC822.SIZE 3568 ENVELOPE (\"Sat, 13 Jul 2002 00:50:58 +0300\" \"Nested MIME\" ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((NIL NIL \"NIL\" NIL)) ((NIL NIL \"NIL\" NIL)) NIL \"<200207122150.g6CLowb05126@Mirddin.farlep.net>\") BODY ((\"text\" \"plain\" (\"name\" \"msg.21\" \"charset\" \"us-ascii\") \"<5122.1026510654.2@Mirddin.farlep.net>\" \"Father William Part I\" 7BIT 353 11)((\"application\" \"octet-stream\" (\"name\" \"msg.22\") \"<5122.1026510654.4@Mirddin.farlep.net>\" \"Father William Part II\" \"base64\" 488)((\"application\" \"octet-stream\" (\"name\" \"msg.23\") \"<5122.1026510654.6@Mirddin.farlep.net>\" \"Father William Part III\" \"base64\" 492)(\"application\" \"octet-stream\" (\"name\" \"msg.24\") \"<5122.1026510654.7@Mirddin.farlep.net>\" \"Father William Part IV\" \"base64\" 504) \"mixed\" NIL NIL NIL) \"mixed\" NIL NIL NIL) \"mixed\" NIL NIL NIL))"\
 "OK"
 
-#end of fetch.exp
\ No newline at end of file
+#end of fetch.exp