zsh-workers
 help / color / mirror / code / Atom feed
From: Felipe Contreras <felipe.contreras@gmail.com>
To: Peter Stephenson <p.w.stephenson@ntlworld.com>
Cc: zsh workers <zsh-workers@zsh.org>
Subject: Re: Bug with continue?
Date: Thu, 30 Mar 2023 02:08:36 -0600	[thread overview]
Message-ID: <CAMP44s0zfs92xtVJZ9jZC94PpxVD8ynvk-LC9=Ry2qWU23ZoeA@mail.gmail.com> (raw)
In-Reply-To: <701977041.1402683.1680009412504@mail.virginmedia.com>

On Tue, Mar 28, 2023 at 7:17 AM Peter Stephenson
<p.w.stephenson@ntlworld.com> wrote:
>
> > On 28/03/2023 12:19 Mikael Magnusson <mikachu@gmail.com> wrote:
> > Replacing continue && with ! continue || has the same effect,
>
> Missed this one, thanks.
>
> pws
>
> diff --git a/Src/exec.c b/Src/exec.c
> index 3330bbce8..4328975b9 100644
> --- a/Src/exec.c
> +++ b/Src/exec.c
> @@ -1491,7 +1491,7 @@ execlist(Estate state, int dont_change_job, int exiting)
>                  * we find a sublist followed by ORNEXT.                   */
>                 if ((ret = ((WC_SUBLIST_FLAGS(code) & WC_SUBLIST_SIMPLE) ?
>                             execsimple(state) :
> -                           execpline(state, code, Z_SYNC, 0)))) {
> +                           execpline(state, code, Z_SYNC, 0))) || breaks) {
>                     state->pc = next;
>                     code = *state->pc++;
>                     next = state->pc + WC_SUBLIST_SKIP(code);
> @@ -1524,7 +1524,7 @@ execlist(Estate state, int dont_change_job, int exiting)
>                  * we find a sublist followed by ANDNEXT.              */
>                 if (!(ret = ((WC_SUBLIST_FLAGS(code) & WC_SUBLIST_SIMPLE) ?
>                              execsimple(state) :
> -                            execpline(state, code, Z_SYNC, 0)))) {
> +                            execpline(state, code, Z_SYNC, 0))) || breaks) {
>                     state->pc = next;
>                     code = *state->pc++;
>                     next = state->pc + WC_SUBLIST_SKIP(code);

FWIW I can confirm this fixes the issue both in my toy case, and the
real code that prompted me to report the issue.

Thanks.

-- 
Felipe Contreras


  reply	other threads:[~2023-03-30  8:09 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <CAMP44s3NCDJU9TcSuSgy5oH=-iK3zpP3Vc1+95d3n16uydHhFA@mail.gmail.com>
     [not found] ` <16795430.3614208.1679998628194@mail.virginmedia.com>
2023-03-28 11:19   ` Mikael Magnusson
2023-03-28 13:16     ` Peter Stephenson
2023-03-30  8:08       ` Felipe Contreras [this message]
     [not found]   ` <805138511.3622784.1680002886460@mail.virginmedia.com>
2023-03-28 11:56     ` Peter Stephenson
2023-03-29 10:02     ` Peter Stephenson

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='CAMP44s0zfs92xtVJZ9jZC94PpxVD8ynvk-LC9=Ry2qWU23ZoeA@mail.gmail.com' \
    --to=felipe.contreras@gmail.com \
    --cc=p.w.stephenson@ntlworld.com \
    --cc=zsh-workers@zsh.org \
    /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).