From cfa8d8bcadbdfdcd976813ef0392539cf3819342 Mon Sep 17 00:00:00 2001 From: "Barton E. Schaefer" Date: Mon, 18 Jan 2016 21:01:30 -0800 Subject: 37682: when SH_GLOB is set, do not parse bare parentheses in arguments as a pattern grouping. --- ChangeLog | 5 +++++ Src/lex.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 351dedede..18ea94f53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,11 @@ Src/zsh.h, Test/D02glob.ztst: also ! and ^ need to be tokenised in character set. +2016-01-18 Barton E. Schaefer + + * 37682: Src/lex.c: when SH_GLOB is set (e.g. in "sh" emulation) + do not parse bare parentheses in arguments as a pattern grouping. + 2016-01-18 Daniel Shahaf * 37678: Src/glob.c, Src/lex.c, Src/pattern.c, Src/utils.c, diff --git a/Src/lex.c b/Src/lex.c index 0202d2559..3ea878c7b 100644 --- a/Src/lex.c +++ b/Src/lex.c @@ -803,7 +803,7 @@ gettok(void) return INOUTPAR; hungetc(d); lexstop = 0; - if (!(incond == 1 || incmdpos)) + if (!(isset(SHGLOB) || incond == 1 || incmdpos)) break; return INPAR; case LX1_OUTPAR: -- cgit v1.3.1