[dovecot-cvs] dovecot-lda/src/libsieve sieve.y,1.1.1.1,1.2

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot-lda/src/libsieve
In directory talvi:/tmp/cvs-serv6184

Modified Files:
	sieve.y 
Log Message:
Changed "x not required" -> "x require missing"



Index: sieve.y
===================================================================
RCS file: /var/lib/cvs/dovecot-lda/src/libsieve/sieve.y,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- sieve.y	29 Mar 2005 18:37:59 -0000	1.1.1.1
+++ sieve.y	6 Oct 2005 13:45:35 -0000	1.2
@@ -198,7 +198,7 @@
 	;
 
 action: REJCT STRING             { if (!parse_script->support.reject) {
-				     yyerror("reject not required");
+				     yyerror("reject require missing");
 				     YYERROR;
 				   }
 				   if (!verify_utf8($2)) {
@@ -207,7 +207,7 @@
 				   $$ = new_command(REJCT);
 				   $$->u.str = $2; }
 	| FILEINTO STRING	 { if (!parse_script->support.fileinto) {
-				     yyerror("fileinto not required");
+				     yyerror("fileinto require missing");
 	                             YYERROR;
                                    }
 				   if (!verify_mailbox($2)) {
@@ -224,7 +224,7 @@
 	| STOP			 { $$ = new_command(STOP); }
 	| DISCARD		 { $$ = new_command(DISCARD); }
 	| VACATION vtags STRING  { if (!parse_script->support.vacation) {
-				     yyerror("vacation not required");
+				     yyerror("vacation require missing");
 				     YYERROR;
 				   }
 				   if (($2->mime == -1) && !verify_utf8($3)) {
@@ -233,7 +233,7 @@
   				   $$ = build_vacation(VACATION,
 					    canon_vtags($2), $3); }
         | SETFLAG stringlist     { if (!parse_script->support.imapflags) {
-                                    yyerror("imapflags not required");
+                                    yyerror("imapflags require missing");
                                     YYERROR;
                                    }
                                   if (!verify_stringlist($2, verify_flag)) {
@@ -242,7 +242,7 @@
                                   $$ = new_command(SETFLAG);
                                   $$->u.sl = $2; }
          | ADDFLAG stringlist     { if (!parse_script->support.imapflags) {
-                                    yyerror("imapflags not required");
+                                    yyerror("imapflags require missing");
                                     YYERROR;
                                     }
                                   if (!verify_stringlist($2, verify_flag)) {
@@ -251,7 +251,7 @@
                                   $$ = new_command(ADDFLAG);
                                   $$->u.sl = $2; }
          | REMOVEFLAG stringlist  { if (!parse_script->support.imapflags) {
-                                    yyerror("imapflags not required");
+                                    yyerror("imapflags require missing");
                                     YYERROR;
                                     }
                                   if (!verify_stringlist($2, verify_flag)) {
@@ -260,18 +260,18 @@
                                   $$ = new_command(REMOVEFLAG);
                                   $$->u.sl = $2; }
          | MARK                   { if (!parse_script->support.imapflags) {
-                                    yyerror("imapflags not required");
+                                    yyerror("imapflags require missing");
                                     YYERROR;
                                     }
                                   $$ = new_command(MARK); }
          | UNMARK                 { if (!parse_script->support.imapflags) {
-                                    yyerror("imapflags not required");
+                                    yyerror("imapflags require missing");
                                     YYERROR;
                                     }
                                   $$ = new_command(UNMARK); }
 
          | NOTIFY ntags           { if (!parse_script->support.notify) {
-				       yyerror("notify not required");
+				       yyerror("notify require missing");
 				       $$ = new_command(NOTIFY); 
 				       YYERROR;
 	 			    } else {
@@ -279,7 +279,7 @@
 				             canon_ntags($2));
 				    } }
          | DENOTIFY dtags         { if (!parse_script->support.notify) {
-                                       yyerror("notify not required");
+                                       yyerror("notify require missing");
 				       $$ = new_command(DENOTIFY);
 				       YYERROR;
 				    } else {
@@ -436,7 +436,7 @@
 
 addrorenv: ADDRESS		 { $$ = ADDRESS; }
 	| ENVELOPE		 {if (!parse_script->support.envelope)
-	                              {yyerror("envelope not required"); YYERROR;}
+	                              {yyerror("envelope require missing"); YYERROR;}
 	                          else{$$ = ENVELOPE; }
 	                         }
 
@@ -465,7 +465,7 @@
 			yyerror("duplicate comparator tag"); YYERROR; }
 				   else if (!strcmp($3, "i;ascii-numeric") &&
 					    !parse_script->support.i_ascii_numeric) {
-			yyerror("comparator-i;ascii-numeric not required");
+			yyerror("comparator-i;ascii-numeric require missing");
 			YYERROR; }
 				   else { $$->comparator = $3; } }
 	;
@@ -488,7 +488,7 @@
 			 yyerror("duplicate comparator tag"); YYERROR; }
 				   else if (!strcmp($3, "i;ascii-numeric") &&
 					    !parse_script->support.i_ascii_numeric) { 
-			 yyerror("comparator-i;ascii-numeric not required");  YYERROR; }
+			 yyerror("comparator-i;ascii-numeric require missing");  YYERROR; }
 				   else { 
 				     $$->comparator = $3; } }
         ;
@@ -498,12 +498,12 @@
 	| LOCALPART		 { $$ = LOCALPART; }
 	| DOMAIN                 { $$ = DOMAIN; }
 	| USER                   { if (!parse_script->support.subaddress) {
-				     yyerror("subaddress not required");
+				     yyerror("subaddress require missing");
 				     YYERROR;
 				   }
 				   $$ = USER; }  
 	| DETAIL                { if (!parse_script->support.subaddress) {
-				     yyerror("subaddress not required");
+				     yyerror("subaddress require missing");
 				     YYERROR;
 				   }
 				   $$ = DETAIL; }
@@ -512,19 +512,19 @@
 	| CONTAINS		 { $$ = CONTAINS; }
 	| MATCHES		 { $$ = MATCHES; }
 	| REGEX			 { if (!parse_script->support.regex) {
-				     yyerror("regex not required");
+				     yyerror("regex require missing");
 				     YYERROR;
 				   }
 				   $$ = REGEX; }
 	;
 
 relcomp: COUNT			 { if (!parse_script->support.relational) {
-				     yyerror("relational not required");
+				     yyerror("relational require missing");
 				     YYERROR;
 				   }
 				   $$ = COUNT; }
 	| VALUE			 { if (!parse_script->support.relational) {
-				     yyerror("relational not required");
+				     yyerror("relational require missing");
 				     YYERROR;
 				   }
 				   $$ = VALUE; }