Re: Test Failures in Latest CVS

[Peter Stephenson <pws@xxxxxxxxxxxxxxxxxxxxxxxx>]

Vin Shelton wrote:
> Hello,
> 
> The 5/21 build passes all tests, but builds from the current CVS do not:

This is because I changed OPT_ISSET() to return either 1 or 0, based on
noticing that some code expects that, but other bits of code were using
OPT_ISSET() to test for specific bits.

Index: Src/builtin.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/builtin.c,v
retrieving revision 1.101
diff -u -r1.101 builtin.c
--- Src/builtin.c	15 May 2003 09:39:57 -0000	1.101
+++ Src/builtin.c	24 May 2003 22:39:26 -0000
@@ -2145,7 +2145,7 @@
     }
 
     if (!(OPT_ISSET(ops,'g') || OPT_ISSET(ops,'x') || OPT_ISSET(ops,'m')) || 
-	OPT_ISSET(ops,'g') == 2 || *name == 'l' ||
+	OPT_PLUS(ops,'g') || *name == 'l' ||
 	(!isset(GLOBALEXPORT) && !OPT_ISSET(ops,'g')))
 	on |= PM_LOCAL;
 
@@ -2263,7 +2263,7 @@
 		returnval = 1;
 		continue;
 	    }
-	    if (OPT_PLUS(ops,'m') == 2 && !asg->value) {
+	    if (OPT_PLUS(ops,'m') && !asg->value) {
 		scanmatchtable(paramtab, pprog, on|roff, 0,
 			       paramtab->printnode, printflags);
 		continue;
@@ -2351,7 +2351,7 @@
     int on = 0, off = 0, pflags = 0;
 
     /* Do we have any flags defined? */
-    if (OPT_ISSET(ops,'u') == 2)
+    if (OPT_PLUS(ops,'u'))
 	off |= PM_UNDEFINED;
     else if (OPT_MINUS(ops,'u') || OPT_ISSET(ops,'X'))
 	on |= PM_UNDEFINED;

-- 
Peter Stephenson <pws@xxxxxxxxxxxxxxxxxxxxxxxx>
Work: pws@xxxxxxx
Web: http://www.pwstephenson.fsnet.co.uk