Re: [BUG] Anonymous functions cause funcfiletrace to produce function-relative line numbers

[Peter Stephenson <p.stephenson@samsung.com>]

I think this might be going in the right direction.

We don't need PM_ANONYMOUS, and in fact we've tested before by using a
special name pointer, but I quite like it for future use anyway...

I tried it with the following...

#snip
# this is line 1

foo() {

bar() { () { (){ print -rC2 -- $functrace $funcfiletrace; } } }
}
foo
bar
#snip

and got

(anon):0     ./why.txt:5
bar:0        ./why.txt:5
./why.txt:8  ./why.txt:8
zsh:1        zsh:1

which looks an improvement.

Probably not much activity till the New Year now.

pws


diff --git a/Src/exec.c b/Src/exec.c
index 3678ef8..38cc24a 100644
--- a/Src/exec.c
+++ b/Src/exec.c
@@ -5089,7 +5089,11 @@ execfuncdef(Estate state, Eprog redir_prog)
 	shf->node.flags = 0;
 	/* No dircache here, not a directory */
 	shf->filename = ztrdup(scriptfilename);
-	shf->lineno = lineno;
+	shf->lineno =
+	    (funcstack && (funcstack->tp == FS_FUNC ||
+			   funcstack->tp == FS_EVAL)) ?
+	    funcstack->flineno + lineno :
+	    lineno;
 	/*
 	 * redir_prog is permanently allocated --- but if
 	 * this function has multiple names we need an additional
@@ -5109,6 +5113,7 @@ execfuncdef(Estate state, Eprog redir_prog)
 	    LinkList args;
 
 	    anon_func = 1;
+	    shf->node.flags |= PM_ANONYMOUS;
 
 	    state->pc = end;
 	    end += *state->pc++;
diff --git a/Src/zsh.h b/Src/zsh.h
index 24d06ba..22ae954 100644
--- a/Src/zsh.h
+++ b/Src/zsh.h
@@ -1875,6 +1875,7 @@ struct tieddata {
 #define PM_DONTIMPORT_SUID (1<<19) /* do not import if running setuid */
 #define PM_LOADDIR      (1<<19) /* (function) filename gives load directory */
 #define PM_SINGLE       (1<<20) /* special can only have a single instance  */
+#define PM_ANONYMOUS    (1<<20) /* (function) anonymous function            */
 #define PM_LOCAL	(1<<21) /* this parameter will be made local        */
 #define PM_SPECIAL	(1<<22) /* special builtin parameter                */
 #define PM_DONTIMPORT	(1<<23)	/* do not import this variable              */