Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
PATCH: break: more completely enumerate loop types we are not in
- X-seq: zsh-workers 44362
- From: Mikael Magnusson <mikachu@xxxxxxxxx>
- To: zsh-workers@xxxxxxx
- Subject: PATCH: break: more completely enumerate loop types we are not in
- Date: Sat, 25 May 2019 21:29:10 +0200
- 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==
- List-help: <mailto:zsh-workers-help@zsh.org>
- List-id: Zsh Workers List <zsh-workers.zsh.org>
- List-post: <mailto:zsh-workers@zsh.org>
- List-unsubscribe: <mailto:zsh-workers-unsubscribe@zsh.org>
- Mailing-list: contact zsh-workers-help@xxxxxxx; run by ezmlm
---
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
Messages sorted by:
Reverse Date,
Date,
Thread,
Author