zsh-workers
 help / color / mirror / code / Atom feed
From: Peter Stephenson <pws@pwstephenson.fsnet.co.uk>
To: Vin Shelton <acs@alumni.princeton.edu>
Cc: zsh-workers@sunsite.dk
Subject: Re: Test Failures in Latest CVS
Date: Sat, 24 May 2003 23:42:51 +0100	[thread overview]
Message-ID: <20030524224257.393F11B76D@pwstephenson.fsnet.co.uk> (raw)
In-Reply-To: "Vin Shelton"'s message of "Fri, 23 May 2003 20:49:10 EDT." <m21xyp1855.fsf@zion.rcn.com>

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@pwstephenson.fsnet.co.uk>
Work: pws@csr.com
Web: http://www.pwstephenson.fsnet.co.uk


  reply	other threads:[~2003-05-24 22:42 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2003-05-24  0:49 Vin Shelton
2003-05-24 22:42 ` Peter Stephenson [this message]
2003-05-24 23:16   ` Vin Shelton

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20030524224257.393F11B76D@pwstephenson.fsnet.co.uk \
    --to=pws@pwstephenson.fsnet.co.uk \
    --cc=acs@alumni.princeton.edu \
    --cc=zsh-workers@sunsite.dk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).