diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2008-08-11 19:22:54 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2008-08-11 19:22:54 +0000 |
| commit | 2853ca830ac8d504b7374de2be0ec82122d33c2d (patch) | |
| tree | d86ea41af13f51f6a9549833a3463c6da307bfc0 /Src/parse.c | |
| parent | 2e485d60ffbf14a461a2d814b30245a9141abeb7 (diff) | |
| download | zsh-2853ca830ac8d504b7374de2be0ec82122d33c2d.tar.gz zsh-2853ca830ac8d504b7374de2be0ec82122d33c2d.tar.xz zsh-2853ca830ac8d504b7374de2be0ec82122d33c2d.zip | |
25247 with further modifications: add $funcsourcetrace
Diffstat (limited to 'Src/parse.c')
| -rw-r--r-- | Src/parse.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Src/parse.c b/Src/parse.c index beb88b451..a455b591e 100644 --- a/Src/parse.c +++ b/Src/parse.c @@ -720,7 +720,8 @@ par_sublist2(int *complex) static int par_pline(int *complex) { - int p, line = lineno; + int p; + zlong line = lineno; p = ecadd(0); @@ -1414,8 +1415,9 @@ par_subsh(int *complex) static void par_funcdef(void) { - int oecused = ecused, oldlineno = lineno, num = 0, onp, p, c = 0; + int oecused = ecused, num = 0, onp, p, c = 0; int so, oecssub = ecssub; + zlong oldlineno = lineno; lineno = 0; nocorrect = 1; @@ -1646,7 +1648,8 @@ par_simple(int *complex, int nr) p += nrediradd; sr += nrediradd; } else if (tok == INOUTPAR) { - int oldlineno = lineno, onp, so, oecssub = ecssub; + zlong oldlineno = lineno; + int onp, so, oecssub = ecssub; *complex = c; lineno = 0; @@ -2860,7 +2863,8 @@ cur_add_func(char *nam, Shfunc shf, LinkList names, LinkList progs, return 1; } noaliases = (shf->node.flags & PM_UNALIASED); - if (!(prog = getfpfunc(shf->node.nam, NULL)) || prog == &dummy_eprog) { + if (!(prog = getfpfunc(shf->node.nam, NULL, NULL)) || + prog == &dummy_eprog) { noaliases = ona; zwarnnam(nam, "can't load function: %s", shf->node.nam); return 1; |