Re: [PATCH v3 4/8] sequencer: define array with enum values
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jun 28, 2022, 21:02 UTC
- Message-ID
- <xmqqh744ijsk.fsf@gitster.g>
- In-Reply-To
- <6528a50343f0fc3c0b2134f1af29cc30fab4f81f.1656422759.git.gitgitgadget@gmail.com>
"Derrick Stolee via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 9 quoted lines
> From: Derrick Stolee <derrickstolee@github.com> > > The todo_command_info array defines which strings match with which > todo_command enum values. The array is defined in the same order as the > enum values, but if one changed without the other, then we would have > unexpected results. > > Make it easier to see changes to the enum and this array by using the > enum values as the indices of the array.
OK. It is a bit of shame that we cannot define this array and enum at the same time in a single construct, but this is much safer than the status quo. Thanks.
Show 45 quoted lines
>
> Signed-off-by: Derrick Stolee <derrickstolee@github.com>
> ---
> sequencer.c | 28 ++++++++++++++--------------
> 1 file changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/sequencer.c b/sequencer.c
> index 1094e146b99..2ffee79619c 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -1685,20 +1685,20 @@ static struct {
> char c;
> const char *str;
> } todo_command_info[] = {
> - { 'p', "pick" },
> - { 0, "revert" },
> - { 'e', "edit" },
> - { 'r', "reword" },
> - { 'f', "fixup" },
> - { 's', "squash" },
> - { 'x', "exec" },
> - { 'b', "break" },
> - { 'l', "label" },
> - { 't', "reset" },
> - { 'm', "merge" },
> - { 0, "noop" },
> - { 'd', "drop" },
> - { 0, NULL }
> + [TODO_PICK] = { 'p', "pick" },
> + [TODO_REVERT] = { 0, "revert" },
> + [TODO_EDIT] = { 'e', "edit" },
> + [TODO_REWORD] = { 'r', "reword" },
> + [TODO_FIXUP] = { 'f', "fixup" },
> + [TODO_SQUASH] = { 's', "squash" },
> + [TODO_EXEC] = { 'x', "exec" },
> + [TODO_BREAK] = { 'b', "break" },
> + [TODO_LABEL] = { 'l', "label" },
> + [TODO_RESET] = { 't', "reset" },
> + [TODO_MERGE] = { 'm', "merge" },
> + [TODO_NOOP] = { 0, "noop" },
> + [TODO_DROP] = { 'd', "drop" },
> + [TODO_COMMENT] = { 0, NULL },
> };
>
> static const char *command_to_string(const enum todo_command command)