From: Junio C Hamano <gitster@pobox.com>
To: Patrick Steinhardt <ps@pks.im>
Cc: git <git@vger.kernel.org>, Christian Couder <christian.couder@gmail.com>
Subject: Re: [PATCH 4/9] update-ref: organize commands in an array
Date: Fri, 27 Mar 2020 14:25:34 -0700 [thread overview]
Message-ID: <xmqqh7y9fq29.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <50ffc263293571f8af71fd1d253ac238c6909229.1585129842.git.ps@pks.im> (Patrick Steinhardt's message of "Wed, 25 Mar 2020 10:53:55 +0100")
Patrick Steinhardt <ps@pks.im> writes:
> +static const struct parse_cmd {
> + const char *prefix;
> + const char *(*fn)(struct ref_transaction *, struct strbuf *, const char *);
> +} commands[] = {
Do not call an array the represents a set of THINGs "type things[]";
instead call it "type thing[]", so that the 0th thing can be
referred to as thing[0], not things[0].
One exception is when the set as a whole is referred to more often
than individual element of an array, in which case "things" (without
the [index]) becomes a sensible way to refer to the set.
> + { "update", parse_cmd_update },
> + { "create", parse_cmd_create },
> + { "delete", parse_cmd_delete },
> + { "verify", parse_cmd_verify },
> + { "option", parse_cmd_option },
> +};
> +
> static void update_refs_stdin(struct ref_transaction *transaction)
> {
> struct strbuf input = STRBUF_INIT;
> const char *next;
> + int i;
>
> if (strbuf_read(&input, 0, 1000) < 0)
> die_errno("could not read from stdin");
> next = input.buf;
> /* Read each line dispatch its command */
> while (next < input.buf + input.len) {
> + const struct parse_cmd *cmd = NULL;
> +
> if (*next == line_termination)
> die("empty command in input");
> else if (isspace(*next))
> die("whitespace before command: %s", next);
> - else if (skip_prefix(next, "update ", &next))
> - next = parse_cmd_update(transaction, &input, next);
> - else if (skip_prefix(next, "create ", &next))
> - next = parse_cmd_create(transaction, &input, next);
> - else if (skip_prefix(next, "delete ", &next))
> - next = parse_cmd_delete(transaction, &input, next);
> - else if (skip_prefix(next, "verify ", &next))
> - next = parse_cmd_verify(transaction, &input, next);
> - else if (skip_prefix(next, "option ", &next))
> - next = parse_cmd_option(&input, next);
> - else
> +
> + for (i = 0; i < ARRAY_SIZE(commands); i++) {
> + if (!skip_prefix(next, commands[i].prefix , &next))
> + continue;
> + cmd = &commands[i];
> + break;
> + }
The only reason why you had to sprinkle
if (!skip_prefix(next, " ", &next))
die(_("%s: missing space after command"), cmd);
all over the place is because the table lacks the trailing SP (which
makes sense---after all, you are making a table of commands). In
other words, it's not like some command called from this dispatcher
would require " " after the command name and some others would not.
So why not avoid touching the parse_cmd_<cmd>() at all (except for
the "option" thing that now needs to take the transaction object for
uniformity), and then verify the presence of " " here, perhaps like
this:
for (i = 0; i < ARRAY_SIZE(command); i++) {
const char *eoc;
if (!skip_prefix(next, commands[i].prefix, &eoc) ||
*eoc != ' ')
continue;
cmd = &command[i];
next = eoc;
break;
}
Note that you cannot reuse &next here to future-proof the code;
otherwise, you wouldn't be able to add a new command, e.g. "options",
that sits next to the existing command "option", in the future.
> + if (!cmd)
> die("unknown command: %s", next);
>
> + if (input.buf[strlen(cmd->prefix)] != line_termination &&
> + input.buf[strlen(cmd->prefix)] != '\0' &&
> + input.buf[strlen(cmd->prefix)] != ' ')
> + die("%s: no separator after command", cmd->prefix);
This part of your version does not make sense to me. If the input
line began with "update" with some separator that is not a SP, the
original would not have matched. But with this code, "update\0"
would pass this code and cause cmd->fn() to be called, only to get
the input rejected, because next is not pointing to SP. So why do
you even need this if statement?
> +
> + next = cmd->fn(transaction, &input, next);
> next++;
> }
Thanks.
next prev parent reply other threads:[~2020-03-27 21:25 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-25 9:53 [PATCH 0/9] Support for transactions in `git-update-ref --stdin` Patrick Steinhardt
2020-03-25 9:53 ` [PATCH 1/9] refs: fix segfault when aborting empty transaction Patrick Steinhardt
2020-03-27 19:59 ` Junio C Hamano
2020-03-25 9:53 ` [PATCH 2/9] git-update-ref.txt: add missing word Patrick Steinhardt
2020-03-25 9:53 ` [PATCH 3/9] strbuf: provide function to append whole lines Patrick Steinhardt
2020-03-27 21:04 ` Junio C Hamano
2020-03-30 13:25 ` Patrick Steinhardt
2020-03-30 17:12 ` Junio C Hamano
2020-03-25 9:53 ` [PATCH 4/9] update-ref: organize commands in an array Patrick Steinhardt
2020-03-27 21:25 ` Junio C Hamano [this message]
2020-03-30 8:05 ` Patrick Steinhardt
2020-03-30 16:55 ` Junio C Hamano
2020-03-30 17:37 ` Patrick Steinhardt
2020-03-25 9:54 ` [PATCH 5/9] update-ref: drop unused argument for `parse_refname` Patrick Steinhardt
2020-03-25 9:54 ` [PATCH 6/9] update-ref: pass end pointer instead of strbuf Patrick Steinhardt
2020-03-25 9:54 ` [PATCH 7/9] update-ref: move transaction handling into `update_refs_stdin()` Patrick Steinhardt
2020-03-27 21:44 ` Junio C Hamano
2020-03-25 9:54 ` [PATCH 8/9] update-ref: read commands in a line-wise fashion Patrick Steinhardt
2020-03-27 21:58 ` Junio C Hamano
2020-03-30 8:11 ` Patrick Steinhardt
2020-03-30 17:39 ` Junio C Hamano
2020-03-25 9:54 ` [PATCH 9/9] update-ref: implement interactive transaction handling Patrick Steinhardt
2020-03-27 22:00 ` Junio C Hamano
2020-03-30 13:46 ` [PATCH v2 0/9] Support for transactions in `git-update-ref --stdin` Patrick Steinhardt
2020-03-30 13:46 ` [PATCH v2 1/9] refs: fix segfault when aborting empty transaction Patrick Steinhardt
2020-03-30 13:46 ` [PATCH v2 2/9] git-update-ref.txt: add missing word Patrick Steinhardt
2020-03-30 13:46 ` [PATCH v2 3/9] strbuf: provide function to append whole lines Patrick Steinhardt
2020-03-30 13:46 ` [PATCH v2 4/9] update-ref: organize commands in an array Patrick Steinhardt
2020-03-30 13:46 ` [PATCH v2 5/9] update-ref: drop unused argument for `parse_refname` Patrick Steinhardt
2020-03-30 13:46 ` [PATCH v2 6/9] update-ref: pass end pointer instead of strbuf Patrick Steinhardt
2020-03-30 13:46 ` [PATCH v2 7/9] update-ref: move transaction handling into `update_refs_stdin()` Patrick Steinhardt
2020-03-30 13:46 ` [PATCH v2 8/9] update-ref: read commands in a line-wise fashion Patrick Steinhardt
2020-03-30 13:47 ` [PATCH v2 9/9] update-ref: implement interactive transaction handling Patrick Steinhardt
2020-04-02 7:09 ` [PATCH v3 0/9] Support for transactions in `git-update-ref --stdin` Patrick Steinhardt
2020-04-02 7:09 ` [PATCH v3 1/9] refs: fix segfault when aborting empty transaction Patrick Steinhardt
2020-04-02 7:09 ` [PATCH v3 2/9] git-update-ref.txt: add missing word Patrick Steinhardt
2020-04-02 7:09 ` [PATCH v3 3/9] strbuf: provide function to append whole lines Patrick Steinhardt
2020-04-02 7:09 ` [PATCH v3 4/9] update-ref: organize commands in an array Patrick Steinhardt
2020-04-02 7:09 ` [PATCH v3 5/9] update-ref: drop unused argument for `parse_refname` Patrick Steinhardt
2020-04-02 7:09 ` [PATCH v3 6/9] update-ref: pass end pointer instead of strbuf Patrick Steinhardt
2020-04-02 7:09 ` [PATCH v3 7/9] update-ref: move transaction handling into `update_refs_stdin()` Patrick Steinhardt
2020-04-02 7:09 ` [PATCH v3 8/9] update-ref: read commands in a line-wise fashion Patrick Steinhardt
2020-04-02 7:10 ` [PATCH v3 9/9] update-ref: implement interactive transaction handling Patrick Steinhardt
2020-04-03 13:40 ` Phillip Wood
2020-04-03 16:51 ` Patrick Steinhardt
2020-04-03 17:33 ` Junio C Hamano
2020-04-03 17:35 ` Junio C Hamano
2020-04-06 7:10 ` Patrick Steinhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqh7y9fq29.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=ps@pks.im \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).