From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from primenet.com.au (ns1.primenet.com.au [203.24.36.2]) by inbox.vuxu.org (OpenSMTPD) with ESMTP id c7b7c284 for ; Sat, 25 May 2019 19:30:27 +0000 (UTC) Received: (qmail 26043 invoked by alias); 25 May 2019 19:30:09 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: List-Unsubscribe: X-Seq: 44362 Received: (qmail 25201 invoked by uid 1010); 25 May 2019 19:30:09 -0000 X-Qmail-Scanner-Diagnostics: from mail-lj1-f170.google.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.101.2/25454. spamassassin: 3.4.2. Clear:RC:0(209.85.208.170):SA:0(-2.0/5.0):. Processed in 1.765381 secs); 25 May 2019 19:30:09 -0000 X-Envelope-From: mikachu@gmail.com X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: pass (ns1.primenet.com.au: SPF record at _netblocks.google.com designates 209.85.208.170 as permitted sender) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=L05LpAY/1KVhBrddGeU93l1UcZRS0sZb9PZaSvfi8gc=; b=rC+mvUPGfFdIEghu8iSTc487WxFQntjsf//VuVQkPXgh+X4PlJaM2EXVGRAT3fPgSj BMCl2LkEM4ZPNctSH7w8W6xNvnN2i4YUkW0tEDn3mCruhjma34yzUniTy+zskzgEI4Nx 3N2sSkkvkzKbBWt990xqLzouEuoFG+7SlfPNdqwxiuSHXuLr+TlYoqfDMEXvpUWyBDf5 Y2R+LGBWbdTcSFQvwgOA/sPqt3j1wcnzBs6Yt2GEUaUgRCeDiVOtgGeEX82hU8szsppQ f0f+a7R+Lt8Frm545RIMPfSj20Aj0bH3ZT7WF0p/KkjuSCxMidYPW8X28hZwPP100bCn oUNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=L05LpAY/1KVhBrddGeU93l1UcZRS0sZb9PZaSvfi8gc=; b=m+gWNIFnmbSSSgoLWRYMmJdY0J7qtO1Ws+ZqBfTLgwA/oGTvLHfSOY0L7Mwf9C0yDf 4rwtX8HIWcXKNveV/J48oa1JBdVowY7YA23N7NDdxZ/oKGJo/WvQVkC2VAlZvPdjfoJg 13r9EuVbP/oiJevVu9YoEWFuqlZDS9TKAuEN4Q+w/EaZcRm8r73RmhvYAAuPycLEAjZr EZHVHqbo/Hx4DtX3gHxLgY8cl6VDEHCejfJkCrV+3s1qVt279IZoeTlFyLZtWHBJBlhA ccX5bmGKmzTEXTUyd6u80wKJhDo/Fx+Zf0KRe80Xn7UosPoDxlSpQkqX8y67vli7cnOw /xfA== X-Gm-Message-State: APjAAAXB48Twxd/Zq7RvHeDAUFcPbAd9gdJaboOZHuU6WNBfJg0ffX0e M54CZyHVFPK/sjcVNSUpUlGGriLy X-Google-Smtp-Source: APXvYqw2fxuHMBFH5RDk+p329aAQMh8jmfHArPg31V5ooXif8XL5bUz97LVuYOuAty9g0gPvIkY0FA== X-Received: by 2002:a2e:9742:: with SMTP id f2mr22879926ljj.184.1558812571385; Sat, 25 May 2019 12:29:31 -0700 (PDT) From: Mikael Magnusson To: zsh-workers@zsh.org Subject: PATCH: break: more completely enumerate loop types we are not in Date: Sat, 25 May 2019 21:29:10 +0200 Message-Id: <20190525192910.30730-1-mikachu@gmail.com> X-Mailer: git-send-email 2.15.1 --- Src/builtin.c | 4 ++-- Test/A07control.ztst | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Src/builtin.c b/Src/builtin.c index 2453f82c08..8c17475f1b 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -5590,13 +5590,13 @@ bin_break(char *name, char **argv, UNUSED(Options ops), int func) switch (func) { case BIN_CONTINUE: if (!loops) { /* continue is only permitted in loops */ - zerrnam(name, "not in while, until, select, or repeat loop"); + zerrnam(name, "not in for, while, until, select, or repeat loop"); return 1; } contflag = 1; /* FALLTHROUGH */ case BIN_BREAK: if (!loops) { /* break is only permitted in loops */ - zerrnam(name, "not in while, until, select, or repeat loop"); + zerrnam(name, "not in for, while, until, select, or repeat loop"); return 1; } breaks = nump ? minimum(num,loops) : 1; diff --git a/Test/A07control.ztst b/Test/A07control.ztst index b1a2487324..a3a82a68d1 100644 --- a/Test/A07control.ztst +++ b/Test/A07control.ztst @@ -23,12 +23,19 @@ >start 255 >255 + $ZTST_testdir/../Src/zsh -fc 'fn() { + break + } + fn' +1:break outside loop +?fn:break:1: not in for, while, until, select, or repeat loop + $ZTST_testdir/../Src/zsh -fc 'fn() { continue } fn' 1:continue outside loop -?fn:continue:1: not in while, until, select, or repeat loop +?fn:continue:1: not in for, while, until, select, or repeat loop for outer in 0 1 2 3; do print outer $outer -- 2.15.1