mirror/ zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-06-01 04:46:08 +02:00
Code

23101: various combinations of ZERR with function returns were feature-ridden

This commit is contained in:
Peter Stephenson 2007-01-12 23:10:15 +00:00
parent e8b56578db
commit b4a7ad8269
3 changed files with 75 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2007-01-12 Peter Stephenson <p.w.stephenson@ntlworld.com>
* 23101: Src/signals.c, Test/C03traps.ztst: ZERR traps
had various odd features when combined with function returns.
2007-01-09 Peter Stephenson <p.w.stephenson@ntlworld.com>
* users/11111: Doc/Zsh/options.yo, Src/exec.c, Src/options.c,

8
Src/signals.c
View File

@ -1071,6 +1071,7 @@ dotrapargs(int sig, int *sigtr, void *sigfn)
char *name, num[4];
int trapret = 0;
int obreaks = breaks;
int oretflag = retflag;
int isfunc;
int traperr;
@ -1109,7 +1110,7 @@ dotrapargs(int sig, int *sigtr, void *sigfn)
lexsave();
execsave();
breaks = 0;
breaks = retflag = 0;
runhookdef(BEFORETRAPHOOK, NULL);
if (*sigtr & ZSIG_FUNC) {
int osc = sfcontext;
@ -1176,15 +1177,20 @@ dotrapargs(int sig, int *sigtr, void *sigfn)
if (isfunc) {
breaks = loops;
errflag = 1;
lastval = trapret;
} else {
lastval = trapret-1;
}
/* return triggered */
retflag = 1;
} else {
if (traperr && emulation != EMULATE_SH)
lastval = 1;
if (try_tryflag)
errflag = traperr;
breaks += obreaks;
/* return not triggered: restore old flag */
retflag = oretflag;
if (breaks > loops)
breaks = loops;
}

63
Test/C03traps.ztst
View File

@ -287,6 +287,69 @@
>child exiting
>wait #2 finished, gotsig=0, status=33
fn1() {
setopt errexit
trap 'echo error1' ZERR
false
print Shouldn\'t get here 1a
}
fn2() {
setopt errexit
trap 'echo error2' ZERR
return 1
print Shouldn\'t get here 2a
}
fn3() {
setopt errexit
TRAPZERR() { echo error3; }
false
print Shouldn\'t get here 3a
}
fn4() {
setopt errexit
TRAPZERR() { echo error4; }
return 1
print Shouldn\'t get here 4a
}
(fn1; print Shouldn\'t get here 1b)
(fn2; print Shouldn\'t get here 2b)
(fn3; print Shouldn\'t get here 3b)
(fn4; print Shouldn\'t get here 4b)
1: Combination of ERR_EXIT and ZERR trap
>error1
>error2
>error3
>error4
fn1() { TRAPZERR() { print trap; return 42; }; false; print Broken; }
(fn1)
print Working $?
0: Force return of containing function from TRAPZERR.
>trap
>Working 42
fn2() { trap 'print trap; return 42' ZERR; false; print Broken }
(fn2)
print Working $?
0: Return with non-zero status triggered from within trap '...' ZERR.
>trap
>Working 42
fn3() { TRAPZERR() { print trap; return 0; }; false; print OK this time; }
(fn3)
print Working $?
0: Normal return from TRAPZERR.
>trap
>OK this time
>Working 0
fn4() { trap 'print trap; return 0' ZERR; false; print Broken; }
(fn4)
print Working $?
0: Return with zero status triggered from within trap '...' ZERR.
>trap
>Working 0
%clean
rm -f TRAPEXIT