From: Bart Schaefer <schaefer@brasslantern.com>
To: zsh-workers@zsh.org
Subject: Multi-line conditionals (Re: Sourcing bash completion files)
Date: Thu, 31 Dec 2015 11:31:07 -0800 [thread overview]
Message-ID: <151231113107.ZM1241@torch.brasslantern.com> (raw)
In-Reply-To: <5684E4B2.8000100@gmx.com>
On Dec 31, 3:17am, Eric Cook wrote:
}
} that error is due to [[ not being able to span across lines.
Hmm, I'm relatively sure [[ is supposed to be able to span lines.
There are a number of places where
while (tok == SEPER)
condlex();
appears, but apparently not enough of them. Also it's a bit tricky
because of course [ ... ] mustn't span lines.
diff --git a/Src/parse.c b/Src/parse.c
index 83ba396..6949b13 100644
--- a/Src/parse.c
+++ b/Src/parse.c
@@ -2348,7 +2348,9 @@ par_cond_2(void)
* We fall through here on any non-numeric infix operator
* or any other time there are at least two arguments.
*/
- }
+ } else
+ while (tok == SEPER)
+ condlex();
if (tok == BANG) {
/*
* In "test" compatibility mode, "! -a ..." and "! -o ..."
@@ -2385,7 +2387,7 @@ par_cond_2(void)
/* Check first argument for [[ STRING ]] re-interpretation */
if (s1 /* tok != DOUTBRACK && tok != DAMPER && tok != DBAR */
&& tok != LEXERR && (!dble || n_testargs)) {
- condlex();
+ do condlex(); while (tok == SEPER && condlex != testlex);
return par_cond_double(dupstring("-n"), s1);
} else
YYERROR(ecused);
@@ -2398,14 +2400,16 @@ par_cond_2(void)
* checked it does have a string representation).
*/
tok = STRING;
- }
+ } else
+ while (tok == SEPER && condlex != testlex)
+ condlex();
if (tok == INANG || tok == OUTANG) {
enum lextok xtok = tok;
- condlex();
+ do condlex(); while (tok == SEPER && condlex != testlex);
if (tok != STRING)
YYERROR(ecused);
s3 = tokstr;
- condlex();
+ do condlex(); while (tok == SEPER && condlex != testlex);
ecadd(WCB_COND((xtok == INANG ? COND_STRLT : COND_STRGTR), 0));
ecstr(s1);
ecstr(s3);
@@ -2428,11 +2432,11 @@ par_cond_2(void)
if (!n_testargs)
dble = (s2 && *s2 == '-' && !s2[2]);
incond++; /* parentheses do globbing */
- condlex();
+ do condlex(); while (tok == SEPER && condlex != testlex);
incond--; /* parentheses do grouping */
if (tok == STRING && !dble) {
s3 = tokstr;
- condlex();
+ do condlex(); while (tok == SEPER && condlex != testlex);
if (tok == STRING) {
LinkList l = newlinklist();
@@ -2441,7 +2445,7 @@ par_cond_2(void)
while (tok == STRING) {
addlinknode(l, tokstr);
- condlex();
+ do condlex(); while (tok == SEPER && condlex != testlex);
}
return par_cond_multi(s1, l);
} else
next parent reply other threads:[~2015-12-31 19:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20151230232254.GC12070@drscott.swordarmor.fr>
[not found] ` <151230173658.ZM9725@torch.brasslantern.com>
[not found] ` <5684E4B2.8000100@gmx.com>
2015-12-31 19:31 ` Bart Schaefer [this message]
2015-12-31 22:12 ` Bart Schaefer
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=151231113107.ZM1241@torch.brasslantern.com \
--to=schaefer@brasslantern.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).