From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-38106-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 14612 invoked by alias); 6 Mar 2016 23:05:47 -0000
Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Id: Zsh Workers List <zsh-workers.zsh.org>
List-Post: <mailto:zsh-workers@zsh.org>
List-Help: <mailto:zsh-workers-help@zsh.org>
X-Seq: 38106
Received: (qmail 20899 invoked from network); 6 Mar 2016 23:05:47 -0000
X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID
	autolearn=ham autolearn_force=no version=3.4.1
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=brasslantern-com.20150623.gappssmtp.com; s=20150623;
        h=from:message-id:date:in-reply-to:comments:references:to:subject
         :mime-version;
        bh=/czKjECiXsKWvAqWouIlPnETNsWYlKrR+Zqd10PCGlU=;
        b=lBXCUodJCGGfPNDxczjfqUbtGSSkbXzhFZ/tx+EwGb6yXgp8pSJE+FwWduPukcI2Gx
         2R4tw+xa6gZsjUaUwhH0JgcJD0S7mR/pHxfvmfdzH5c8NUqwXB8iOjLBbuRBsVXLa0Mf
         1qNmYFixXDw49S5Oe1raze420JKDOwMRQAWKGzUOTDHuMPfDvTzYn5E4bKETKlLebOYL
         DTheukG4iSoXiB99J+ULQmoOr0C9e+5/axR0U8DCFfEKHJ9Ly4KwtIUBJi22qR2lqzpP
         N/hbmzV+S6WvWc6qW0iEwcGkRZ873z7D9bd2kHJXjgdNa9tp9Me4Ihkzc6cCAiy97F7Q
         RYxg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20130820;
        h=x-gm-message-state:from:message-id:date:in-reply-to:comments
         :references:to:subject:mime-version;
        bh=/czKjECiXsKWvAqWouIlPnETNsWYlKrR+Zqd10PCGlU=;
        b=D5AV+AjJ11DmQY+RTQvIw0732giJuftaCD2/ZOvUaWA/zv+KOHs7fe0qhfxLQxkqiJ
         Xtzu2XMfEwiRCHOMnbvnR2nXvYbNDtkrHuzG+Kt4WJYS0AACiAfNXggijxHnlpXYozdc
         mWUJbpoVh1dwIIBGr89CY8h4NBl93Kb46hBwcYnvGGXCObl/Ac3m7k7xc9/NnDW1SVOb
         rX5HZe4CG8nGWBkpTd3l7WLOTrrhJDRc8Rh5UIyGxzh2KoSUbheZZCTeYXkNnNMJQijs
         QJLLVJno00AnIrCl4a2i2n7aVUUMrG0pzmEfK/hd7uMByrMkljqJG8Jg3m9DYaAQwvib
         h2+A==
X-Gm-Message-State: AD7BkJIIO4otP0RlZ6s9HErvmLVx5wMsJ2DsGv/sWEqtbIr35GI1W1AHiwOklj1arq+Yxw==
X-Received: by 10.98.93.1 with SMTP id r1mr28871953pfb.57.1457305544251;
        Sun, 06 Mar 2016 15:05:44 -0800 (PST)
From: Bart Schaefer <schaefer@brasslantern.com>
Message-Id: <160306150547.ZM17307@torch.brasslantern.com>
Date: Sun, 6 Mar 2016 15:05:46 -0800
In-Reply-To: <160306142731.ZM3208@torch.brasslantern.com>
Comments: In reply to Bart Schaefer <schaefer@brasslantern.com>
        "Bug in if... then if... parsing" (Mar  6,  2:27pm)
References: <160306142731.ZM3208@torch.brasslantern.com>
X-Mailer: OpenZMail Classic (0.9.2 24April2005)
To: zsh-workers@zsh.org
Subject: Re: Bug in if... then if... parsing
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii

On Mar 6,  2:27pm, Bart Schaefer wrote:
}
} As far as I can tell this only happens when "if" immediately follows "then".

The following seems to be the simplest fix.  I was afraid this was going
to be a lot harder to track down.

Does anyone recall why par_list() and par_list1() return a value when
literally nothing ever examines that value?  What does the 1 or 0 that
is returned even mean?

diff --git a/Src/parse.c b/Src/parse.c
index 628a9aa..349d1e4 100644
--- a/Src/parse.c
+++ b/Src/parse.c
@@ -1413,7 +1413,7 @@ par_if(int *cmplx)
 	}
     }
     cmdpop();
-    if (xtok == ELSE) {
+    if (xtok == ELSE || tok == ELSE) {
 	pp = ecadd(0);
 	cmdpush(CS_ELSE);
 	while (tok == SEPER)