diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Doc/Zsh/mod_parameter.yo | 6 | ||||
| -rw-r--r-- | Src/Modules/parameter.c | 32 | ||||
| -rw-r--r-- | Src/Modules/parameter.mdd | 2 | ||||
| -rw-r--r-- | Src/exec.c | 2 | ||||
| -rw-r--r-- | Src/zsh.h | 2 |
6 files changed, 49 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index defb28bf8..edd47c516 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-09-17 Clint Adams <clint@zsh.org> + + * 22728: Doc/Zsh/mod_parameter.yo, Src/Modules/parameter.c, + Src/Modules/parameter.mdd, Src/exec.c, Src/zsh.h: $functrace + parameter for function backtraces. + 2006-09-17 Peter Stephenson <p.w.stephenson@ntlworld.com> * 22729: Src/Zle/computil.c: truncation of description didn't diff --git a/Doc/Zsh/mod_parameter.yo b/Doc/Zsh/mod_parameter.yo index 04a998f83..529c65d33 100644 --- a/Doc/Zsh/mod_parameter.yo +++ b/Doc/Zsh/mod_parameter.yo @@ -159,4 +159,10 @@ This array contains the names of the functions currently being executed. The first element is the name of the function using the parameter. ) +vindex(functrace) +item(tt(functrace))( +This array contains the names and line numbers of the callers +corresponding to the functions currently being executed. +The format of each element is name:lineno. +) enditem() diff --git a/Src/Modules/parameter.c b/Src/Modules/parameter.c index c3ec441f8..cec31d5cb 100644 --- a/Src/Modules/parameter.c +++ b/Src/Modules/parameter.c @@ -551,6 +551,33 @@ funcstackgetfn(UNUSED(Param pm)) return ret; } +/* Functions for the functrace special parameter. */ + +/**/ +static char ** +functracegetfn(UNUSED(Param pm)) +{ + Funcstack f; + int num; + char **ret, **p; + + for (f = funcstack, num = 0; f; f = f->prev, num++); + + ret = (char **) zhalloc((num + 1) * sizeof(char *)); + + for (f = funcstack, p = ret; f; f = f->prev, p++) { + char *colonpair; + + colonpair = zhalloc(strlen(f->caller) + f->lineno > 9999 ? 24 : 6); + sprintf(colonpair, "%s:%d", f->caller, f->lineno); + + *p = colonpair; + } + *p = NULL; + + return ret; +} + /* Functions for the builtins special parameter. */ /**/ @@ -1843,6 +1870,8 @@ static const struct gsu_hash pmdissaliases_gsu = static const struct gsu_array funcstack_gsu = { funcstackgetfn, arrsetfn, stdunsetfn }; +static const struct gsu_array functrace_gsu = +{ functracegetfn, arrsetfn, stdunsetfn }; static const struct gsu_array reswords_gsu = { reswordsgetfn, arrsetfn, stdunsetfn }; static const struct gsu_array disreswords_gsu = @@ -1868,6 +1897,9 @@ static struct pardef partab[] = { { "funcstack", PM_ARRAY|PM_SPECIAL|PM_READONLY, NULL, NULL, NULL, &funcstack_gsu, NULL }, + { "functrace", PM_ARRAY|PM_SPECIAL|PM_READONLY, + NULL, NULL, NULL, + &functrace_gsu, NULL }, { "builtins", PM_READONLY, getpmbuiltin, scanpmbuiltins, NULL, NULL, NULL }, diff --git a/Src/Modules/parameter.mdd b/Src/Modules/parameter.mdd index a24d1b2c5..2b53fa479 100644 --- a/Src/Modules/parameter.mdd +++ b/Src/Modules/parameter.mdd @@ -2,6 +2,6 @@ name=zsh/parameter link=either load=yes -autoparams="parameters commands functions dis_functions funcstack builtins dis_builtins reswords dis_reswords options modules dirstack history historywords jobtexts jobdirs jobstates nameddirs userdirs aliases dis_aliases galiases dis_galiases" +autoparams="parameters commands functions dis_functions funcstack functrace builtins dis_builtins reswords dis_reswords options modules dirstack history historywords jobtexts jobdirs jobstates nameddirs userdirs aliases dis_aliases galiases dis_galiases" objects="parameter.o" diff --git a/Src/exec.c b/Src/exec.c index 57c0822fb..f9866235d 100644 --- a/Src/exec.c +++ b/Src/exec.c @@ -3798,6 +3798,8 @@ doshfunc(char *name, Eprog prog, LinkList doshargs, int flags, int noreturnval) } #endif fstack.name = dupstring(name); + fstack.caller = dupstring(oargv0 ? oargv0 : argzero); + fstack.lineno = lineno; fstack.prev = funcstack; funcstack = &fstack; diff --git a/Src/zsh.h b/Src/zsh.h index 27bb96493..ce6cf989a 100644 --- a/Src/zsh.h +++ b/Src/zsh.h @@ -1001,6 +1001,8 @@ struct shfunc { struct funcstack { Funcstack prev; /* previous in stack */ char *name; /* name of function called */ + char *caller; /* name of caller */ + int lineno; /* line number in file */ }; /* node in list of function call wrappers */ |