mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-02 22:11:54 +02:00
Code Releases Activity

35184: Additional case fix for 35168.

Browse source 
Lexical analysis flags got screwed up after a "|", so we
didn't parse patterns properly, in particular those with parentheses.
This commit is contained in:
Peter Stephenson 2015-05-18 12:06:43 +01:00
parent 52aeb9aaeb
commit 2d6569e590
3 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2015-05-18 Peter Stephenson <p.stephenson@samsung.com>
* 35184: Src/parse.c, Test/A01grammar.ztst: fix pattern parsing
after "|" in 35168.
* 35168: Completion/Unix/Command/_ant,
Completion/Unix/Command/_cp, Completion/Unix/Command/_locate,
Completion/Unix/Command/_make, Completion/Unix/Command/_tar,

2
Src/parse.c
View file

@ -1174,8 +1174,6 @@ par_case(int *cmplx)
if (!strcmp(tokstr, "esac"))
break;
str = dupstring(tokstr);
incasepat = 0;
incmdpos = 1;
type = WC_CASE_OR;
pp = ecadd(0);
palts = ecadd(0);

15
Test/A01grammar.ztst
View file

@ -543,6 +543,7 @@
. ./bad_syntax
126: Attempt to "." file with bad syntax.
?./bad_syntax:2: parse error near `\n'
# `
echo 'false' >dot_false
. ./dot_false
@ -650,3 +651,17 @@
>Pattern matched five
>Pattern matched six
>Character class matched abecedinarian
case grumph in
( no | (grumph) )
print 1 OK
;;
esac
case snruf in
( fleer | (|snr(|[au]f)) )
print 2 OK
;;
esac
0: case patterns within words
>1 OK
>2 OK