From 6dbc34b0d464a274f6c760b13c1e568a83e0c3f6 Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Sun, 14 Jan 2007 19:22:45 +0000 Subject: 23104: fix line numbers for DEBUGBEFORECMD tidy up some wordcode definitions --- Src/zsh.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'Src/zsh.h') diff --git a/Src/zsh.h b/Src/zsh.h index 6f70fd0df..27c344809 100644 --- a/Src/zsh.h +++ b/Src/zsh.h @@ -703,8 +703,9 @@ struct eccstr { #define WC_LIST_TYPE(C) wc_data(C) #define Z_END (1<<4) #define Z_SIMPLE (1<<5) -#define WC_LIST_SKIP(C) (wc_data(C) >> 6) -#define WCB_LIST(T,O) wc_bld(WC_LIST, ((T) | ((O) << 6))) +#define WC_LIST_FREE (6) /* Next bit available in integer */ +#define WC_LIST_SKIP(C) (wc_data(C) >> WC_LIST_FREE) +#define WCB_LIST(T,O) wc_bld(WC_LIST, ((T) | ((O) << WC_LIST_FREE))) #define WC_SUBLIST_TYPE(C) (wc_data(C) & ((wordcode) 3)) #define WC_SUBLIST_END 0 @@ -714,8 +715,10 @@ struct eccstr { #define WC_SUBLIST_COPROC 4 #define WC_SUBLIST_NOT 8 #define WC_SUBLIST_SIMPLE 16 -#define WC_SUBLIST_SKIP(C) (wc_data(C) >> 5) -#define WCB_SUBLIST(T,F,O) wc_bld(WC_SUBLIST, ((T) | (F) | ((O) << 5))) +#define WC_SUBLIST_FREE (5) /* Next bit available in integer */ +#define WC_SUBLIST_SKIP(C) (wc_data(C) >> WC_SUBLIST_FREE) +#define WCB_SUBLIST(T,F,O) wc_bld(WC_SUBLIST, \ + ((T) | (F) | ((O) << WC_SUBLIST_FREE))) #define WC_PIPE_TYPE(C) (wc_data(C) & ((wordcode) 1)) #define WC_PIPE_END 0 -- cgit v1.2.3