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

25595: fix line numbers with EVAL_LINENO,

Browse source 
try to fix oddities with funcstack and sourced files,
simplify use of caller element of funcstack
This commit is contained in:
Peter Stephenson 2008-09-03 09:08:18 +00:00
parent ae79d264a3
commit 0cba5ef62a
8 changed files with 134 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Src/Modules/parameter.c
View file

@ -583,7 +583,7 @@ funcfiletracegetfn(UNUSED(Param pm))
for (f = funcstack, p = ret; f; f = f->prev, p++) {
char *colonpair, *fname;
if (!f->prev || f->prev->sourced) {
if (!f->prev || f->prev->tp == FS_SOURCE) {
/*
* Calling context is a file---either the parent
* script or interactive shell, or a sourced
@ -595,13 +595,20 @@ funcfiletracegetfn(UNUSED(Param pm))
sprintf(colonpair, "%s:%ld", f->caller, (long)f->lineno);
} else {
/*
* Calling context is a function; we need to find the line number
* in the file where that function was defined. For this we need
* the $funcsourcetrace information for the context above,
* Calling context is a function or eval; we need to find
* the line number in the file where that function was
* defined or the eval was called. For this we need the
* $funcsourcetrace information for the context above,
* together with the $functrace line number for the current
* context.
*/
long flineno = (long)(f->prev->flineno + f->lineno);
/*
* Line numbers in eval start from 1, not zero,
* so offset by one to get line in file.
*/
if (f->prev->tp == FS_EVAL)
flineno--;
fname = f->prev->filename ? f->prev->filename : "";
colonpair = zhalloc(strlen(fname) + (flineno > 9999 ? 24 : 6));