mirror of
git://git.code.sf.net/p/zsh/code
synced 2025-09-05 23:11:11 +02:00
41873: temporarily disable effects of ${(Z:n:)...} for parsing $(...) within the parameter value
Also fix minor typo in commit b3fa5c52
ChangeLog.
This commit is contained in:
parent
7c36add497
commit
1fb6939b94
2 changed files with 11 additions and 2 deletions
|
@ -1,10 +1,15 @@
|
|||
2017-10-13 Barton E. Schaefer <schaefer@zsh.org>
|
||||
|
||||
* 41873: Src/lex.c: temporarily disable effects of ${(Z:n:)...}
|
||||
for parsing $(...) expressions within the parameter value
|
||||
|
||||
2017-10-13 Daniel Shahaf <d.s@daniel.shahaf.name>
|
||||
|
||||
* 41833 + 41838: Completion/Unix/Command/_jq: New completion.
|
||||
|
||||
2017-10-13 Peter Stephenson <p.stephenson@samsung.com>
|
||||
|
||||
* 41877: Src/subst·c, Test/E01options.ztst: Separate out
|
||||
* 41877: Src/subst.c, Test/E01options.ztst: Separate out
|
||||
SH_FILE_EXPANSION loop from parameter substitution as the latter
|
||||
can add nodes: SH_FILE_EXPANSION should see following nodes
|
||||
only, but on the next loop parameter substitution needs to see
|
||||
|
|
|
@ -2128,8 +2128,12 @@ skipcomm(void)
|
|||
* function at the history layer --- this is consistent with the
|
||||
* intention of maintaining the history and input layers across
|
||||
* the recursive parsing.
|
||||
*
|
||||
* Also turn off LEXFLAGS_NEWLINE because this is already skipping
|
||||
* across the entire construct, and parse_event() needs embedded
|
||||
* newlines to be "real" when looking for the OUTPAR token.
|
||||
*/
|
||||
lexflags &= ~LEXFLAGS_ZLE;
|
||||
lexflags &= ~(LEXFLAGS_ZLE|LEXFLAGS_NEWLINE);
|
||||
dbparens = 0; /* restored by zcontext_restore_partial() */
|
||||
|
||||
if (!parse_event(OUTPAR) || tok != OUTPAR) {
|
||||
|
|
Loading…
Reference in a new issue