parse-options: convert bitfield values to use binary shift

Because it's easier to read, but also likely to be easier to maintain.
I am making this change because I need to add a new flag in a later
commit.

Also add a trailing comma to the last enum entry to simplify addition of
new flags.

This change was originally suggested by Peff in:
https://public-inbox.org/git/YEZ%2FBWWbpfVwl6nO@coredump.intra.peff.net/

Signed-off-by: Andrzej Hunt <ajrhunt@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Andrzej Hunt 2021-03-21 16:58:35 +00:00 committed by Junio C Hamano
parent 04fe4d75fa
commit 0171dbcb42

View File

@ -28,26 +28,26 @@ enum parse_opt_type {
}; };
enum parse_opt_flags { enum parse_opt_flags {
PARSE_OPT_KEEP_DASHDASH = 1, PARSE_OPT_KEEP_DASHDASH = 1 << 0,
PARSE_OPT_STOP_AT_NON_OPTION = 2, PARSE_OPT_STOP_AT_NON_OPTION = 1 << 1,
PARSE_OPT_KEEP_ARGV0 = 4, PARSE_OPT_KEEP_ARGV0 = 1 << 2,
PARSE_OPT_KEEP_UNKNOWN = 8, PARSE_OPT_KEEP_UNKNOWN = 1 << 3,
PARSE_OPT_NO_INTERNAL_HELP = 16, PARSE_OPT_NO_INTERNAL_HELP = 1 << 4,
PARSE_OPT_ONE_SHOT = 32 PARSE_OPT_ONE_SHOT = 1 << 5,
}; };
enum parse_opt_option_flags { enum parse_opt_option_flags {
PARSE_OPT_OPTARG = 1, PARSE_OPT_OPTARG = 1 << 0,
PARSE_OPT_NOARG = 2, PARSE_OPT_NOARG = 1 << 1,
PARSE_OPT_NONEG = 4, PARSE_OPT_NONEG = 1 << 2,
PARSE_OPT_HIDDEN = 8, PARSE_OPT_HIDDEN = 1 << 3,
PARSE_OPT_LASTARG_DEFAULT = 16, PARSE_OPT_LASTARG_DEFAULT = 1 << 4,
PARSE_OPT_NODASH = 32, PARSE_OPT_NODASH = 1 << 5,
PARSE_OPT_LITERAL_ARGHELP = 64, PARSE_OPT_LITERAL_ARGHELP = 1 << 6,
PARSE_OPT_SHELL_EVAL = 256, PARSE_OPT_SHELL_EVAL = 1 << 8,
PARSE_OPT_NOCOMPLETE = 512, PARSE_OPT_NOCOMPLETE = 1 << 9,
PARSE_OPT_COMP_ARG = 1024, PARSE_OPT_COMP_ARG = 1 << 10,
PARSE_OPT_CMDMODE = 2048 PARSE_OPT_CMDMODE = 1 << 11,
}; };
enum parse_opt_result { enum parse_opt_result {