PRINT_TYPESET vs PRINT_WHENCE_CSH

PRINT_TYPESET vs PRINT_WHENCE_CSH

[Bart Schaefer]

Either these sets of flags shouldn't overlap at all, or it shouldn't matter
that they both start at (1<<0) ... or there's some reason to imply that
whence and typeset are related?

I suspect it doesn't matter since PRINT_WHENCE_* are only in hashtable.c
whereas the other PRINT_* are only params.c, but ...

/* flags for controlling printing of hash table nodes */
#define PRINT_NAMEONLY		(1<<0)
#define PRINT_TYPE		(1<<1)
#define PRINT_LIST		(1<<2)
#define PRINT_KV_PAIR		(1<<3)
#define PRINT_INCLUDEVALUE	(1<<4)
#define PRINT_TYPESET		(1<<5)

/* flags for printing for the whence builtin */
#define PRINT_WHENCE_CSH	(1<<5)
#define PRINT_WHENCE_VERBOSE	(1<<6)
#define PRINT_WHENCE_SIMPLE	(1<<7)
#define PRINT_WHENCE_FUNCDEF	(1<<9)
#define PRINT_WHENCE_WORD	(1<<10)

Re: PRINT_TYPESET vs PRINT_WHENCE_CSH

[Peter Stephenson]

On Sat, 08 Nov 2014 12:46:04 -0800
Bart Schaefer <schaefer@brasslantern.com> wrote:
> Either these sets of flags shouldn't overlap at all, or it shouldn't matter
> that they both start at (1<<0) ... or there's some reason to imply that
> whence and typeset are related?

I think I added PRINT_TYPESET in 2002 without looking at the others;
they should be kept separate for neatness though it doesn't actually
matter in practice since they apply to different types of node.

We seemed to lose bit 8 at some point.

diff --git a/Src/zsh.h b/Src/zsh.h
index d284c7a..031deaf 100644
--- a/Src/zsh.h
+++ b/Src/zsh.h
@@ -1865,9 +1865,9 @@ typedef groupset *Groupset;
 #define PRINT_TYPESET		(1<<5)
 
 /* flags for printing for the whence builtin */
-#define PRINT_WHENCE_CSH	(1<<5)
-#define PRINT_WHENCE_VERBOSE	(1<<6)
-#define PRINT_WHENCE_SIMPLE	(1<<7)
+#define PRINT_WHENCE_CSH	(1<<6)
+#define PRINT_WHENCE_VERBOSE	(1<<7)
+#define PRINT_WHENCE_SIMPLE	(1<<8)
 #define PRINT_WHENCE_FUNCDEF	(1<<9)
 #define PRINT_WHENCE_WORD	(1<<10)
 

-- 
Peter Stephenson <p.w.stephenson@ntlworld.com>
Web page now at http://homepage.ntlworld.com/p.w.stephenson/