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

27092: missing then-clause for if wasn't an error

Browse source
This commit is contained in:
Peter Stephenson 2009-07-06 20:44:28 +00:00
parent 0cc033db7c
commit c6a3ccc8d7
3 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,9 @@
2009-07-06 Peter Stephenson <p.w.stephenson@ntlworld.com>
* 27092: Src/parse.c, Test/A01grammar.ztst: "if" didn't check
for missing clauses so a missing then-clause wasn't spotted
as an error.
2009-07-05 Peter Stephenson <p.w.stephenson@ntlworld.com> 2009-07-05 Peter Stephenson <p.w.stephenson@ntlworld.com>
* Brendan Cully: 27088: Completion/Unix/Command/_hg, * Brendan Cully: 27088: Completion/Unix/Command/_hg,
@ -11904,5 +11910,5 @@
***************************************************** *****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL * This is used by the shell to define $ZSH_PATCHLEVEL
* $Revision: 1.4727 $ * $Revision: 1.4728 $
***************************************************** *****************************************************

4
Src/parse.c
View file

@ -1199,6 +1199,10 @@ par_if(int *complex)
type = (xtok == IF ? WC_IF_IF : WC_IF_ELIF); type = (xtok == IF ? WC_IF_IF : WC_IF_ELIF);
par_save_list(complex); par_save_list(complex);
incmdpos = 1; incmdpos = 1;
if (tok == ENDINPUT) {
cmdpop();
YYERRORV(oecused);
}
while (tok == SEPER) while (tok == SEPER)
zshlex(); zshlex();
xtok = FI; xtok = FI;

7
Test/A01grammar.ztst
View file

@ -378,10 +378,15 @@
>true-2 >true-2
>false >false
if true; print true if { true } print true
if { false } print false
0:Short form of `if' 0:Short form of `if'
>true >true
eval "if"
1:Short form of `if' can't be too short
?(eval):1: parse error near `if'
for name ( word1 word2 word3 ) print $name for name ( word1 word2 word3 ) print $name
0:Form of `for' with parentheses. 0:Form of `for' with parentheses.
>word1 >word1