From: Olga Telezhnaya <olyatelezhnaya@gmail.com> To: git@vger.kernel.org Subject: [PATCH v2 06/18] ref-filter: reuse parse_ref_filter_atom Date: Wed, 10 Jan 2018 09:36:41 +0000 [thread overview] Message-ID: <01020160df6dc548-3213651c-f87e-40f6-80b3-4fe2ee9131be-000000@eu-west-1.amazonses.com> (raw) In-Reply-To: <01020160df6dc499-0e6d11ec-1dcd-4a71-997b-ea231f33fae4-000000@eu-west-1.amazonses.com> Continue migrating formatting logic from cat-file to ref-filter. Reuse parse_ref_filter_atom for unifying all processes in ref-filter and further reducing of expand_atom_into_fields function. Signed-off-by: Olga Telezhnaia <olyatelezhnaya@gmail.com> Mentored-by: Christian Couder <christian.couder@gmail.com> Mentored by: Jeff King <peff@peff.net> --- ref-filter.c | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/ref-filter.c b/ref-filter.c index 6ca4a671086ee..bb09875e2dbf4 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -100,6 +100,7 @@ static struct used_atom { } u; } *used_atom; static int used_atom_cnt, need_tagged, need_symref; +struct expand_data *cat_file_info; static void color_atom_parser(const struct ref_format *format, struct used_atom *atom, const char *color_value) { @@ -251,6 +252,16 @@ static void objectname_atom_parser(const struct ref_format *format, struct used_ die(_("unrecognized %%(objectname) argument: %s"), arg); } +static void objectsize_atom_parser(const struct ref_format *format, struct used_atom *atom, const char *arg) +{ + if (!arg) + ; /* default to normal object size */ + else if (!strcmp(arg, "disk")) + cat_file_info->info.disk_sizep = &cat_file_info->disk_size; + else + die(_("urecognized %%(objectsize) argument: %s"), arg); +} + static void refname_atom_parser(const struct ref_format *format, struct used_atom *atom, const char *arg) { refname_atom_parser_internal(&atom->u.refname, arg, atom->name); @@ -371,6 +382,14 @@ static struct valid_atom { { "else" }, }; +static struct valid_atom valid_cat_file_atom[] = { + { "objectname" }, + { "objecttype" }, + { "objectsize", FIELD_ULONG, objectsize_atom_parser }, + { "rest" }, + { "deltabase" }, +}; + #define REF_FORMATTING_STATE_INIT { 0, NULL } struct ref_formatting_stack { @@ -401,20 +420,14 @@ static int is_atom(const char *atom, const char *s, int slen) static void expand_atom_into_fields(const char *atom, int len, struct expand_data *data) { - if (is_atom("objectname", atom, len)) - ; /* do nothing */ - else if (is_atom("objecttype", atom, len)) + if (is_atom("objecttype", atom, len)) data->info.typep = &data->type; else if (is_atom("objectsize", atom, len)) data->info.sizep = &data->size; - else if (is_atom("objectsize:disk", atom, len)) - data->info.disk_sizep = &data->disk_size; else if (is_atom("rest", atom, len)) data->split_on_whitespace = 1; else if (is_atom("deltabase", atom, len)) data->info.delta_base_sha1 = data->delta_base_oid.hash; - else - die("unknown format element: %.*s", len, atom); } /* @@ -483,6 +496,8 @@ static int parse_ref_filter_atom(const struct ref_format *format, need_tagged = 1; if (!strcmp(valid_atom[i].name, "symref")) need_symref = 1; + if (cat_file_info) + expand_atom_into_fields(atom, atom_len, cat_file_info); return at; } @@ -726,6 +741,7 @@ int verify_ref_format(struct ref_format *format) { const char *cp, *sp; + cat_file_info = format->cat_file_data; format->need_color_reset_at_eol = 0; for (cp = format->format; *cp && (sp = find_next(cp)); ) { const char *color, *ep = strchr(sp, ')'); @@ -735,10 +751,10 @@ int verify_ref_format(struct ref_format *format) return error(_("malformed format string %s"), sp); /* sp points at "%(" and ep points at the closing ")" */ - if (format->cat_file_data) - expand_atom_into_fields(sp + 2, ep - sp - 2, - format->cat_file_data); - else { + if (format->cat_file_data) { + at = parse_ref_filter_atom(format, valid_cat_file_atom, + ARRAY_SIZE(valid_cat_file_atom), sp + 2, ep); + } else { at = parse_ref_filter_atom(format, valid_atom, ARRAY_SIZE(valid_atom), sp + 2, ep); if (skip_prefix(used_atom[at].name, "color:", &color)) -- https://github.com/git/git/pull/450
next prev parent reply other threads:[~2018-01-10 9:38 UTC|newest] Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-01-09 13:05 [PATCH 01/20] cat-file: split expand_atom into 2 functions Olga Telezhnaya 2018-01-09 13:05 ` [PATCH 09/20] cat-file: get rid of goto in ref-filter Olga Telezhnaya 2018-01-09 13:05 ` [PATCH 05/20] cat-file: move struct expand_data into ref-filter Olga Telezhnaya 2018-01-09 13:05 ` [PATCH 19/20] cat-file: move skip_object_info " Olga Telezhnaya 2018-01-09 13:05 ` [PATCH 08/20] cat-file: remove unused code Olga Telezhnaya 2018-01-09 13:05 ` [PATCH 16/20] cat-file: get rid of expand_atom_into_fields Olga Telezhnaya 2018-01-09 13:05 ` [PATCH 02/20] cat-file: reuse struct ref_format Olga Telezhnaya 2018-01-09 13:05 ` [PATCH 06/20] cat-file: start migrating to ref-filter Olga Telezhnaya 2018-01-09 13:05 ` [PATCH 03/20] cat-file: rename variables in ref-filter Olga Telezhnaya 2018-01-09 22:04 ` Junio C Hamano 2018-01-10 7:07 ` Оля Тележная 2018-01-09 13:05 ` [PATCH 11/20] cat-file: get rid of duplicate checking Olga Telezhnaya 2018-01-09 13:05 ` [PATCH 12/20] cat-file: rename variable in ref-filter Olga Telezhnaya 2018-01-09 13:05 ` [PATCH 04/20] cat-file: make valid_atoms as a function parameter Olga Telezhnaya 2018-01-09 22:16 ` Junio C Hamano 2018-01-09 13:05 ` [PATCH 18/20] cat-file: add split_on_whitespace flag Olga Telezhnaya 2018-01-09 13:05 ` [PATCH 10/20] cat-file: simplify expand_atom function Olga Telezhnaya 2018-01-09 13:05 ` [PATCH 20/20] cat-file: make cat_file_info variable independent Olga Telezhnaya 2018-01-09 13:05 ` [PATCH 15/20] cat-file: start reusing populate_value Olga Telezhnaya 2018-01-09 13:05 ` [PATCH 14/20] cat-file: make populate_value global Olga Telezhnaya 2018-01-09 13:05 ` [PATCH 07/20] cat-file: reuse parse_ref_filter_atom Olga Telezhnaya 2018-01-09 23:32 ` Junio C Hamano 2018-01-09 13:05 ` [PATCH 17/20] cat-file: add is_cat flag in ref-filter Olga Telezhnaya 2018-01-09 13:05 ` [PATCH 13/20] cat-file: start use ref_array_item struct Olga Telezhnaya 2018-01-10 9:36 ` [PATCH v2 01/18] cat-file: split expand_atom into 2 functions Olga Telezhnaya 2018-01-10 9:36 ` [PATCH v2 09/18] cat-file: simplify expand_atom function Olga Telezhnaya 2018-01-10 9:36 ` [PATCH v2 03/18] ref-filter: make valid_atom as function parameter Olga Telezhnaya 2018-01-15 21:42 ` Jeff King 2018-01-16 6:55 ` Оля Тележная 2018-01-17 21:43 ` Jeff King 2018-01-17 22:39 ` Christian Couder 2018-01-18 6:20 ` Оля Тележная 2018-01-18 11:49 ` Оля Тележная 2018-01-18 14:23 ` Christian Couder 2018-01-19 12:24 ` Оля Тележная 2018-01-19 15:48 ` Christian Couder 2018-01-19 17:14 ` Christian Couder 2018-01-19 17:22 ` Оля Тележная 2018-01-19 17:57 ` Christian Couder 2018-01-19 17:23 ` Jeff King 2018-01-19 17:31 ` Christian Couder 2018-01-19 18:47 ` Junio C Hamano 2018-01-19 20:12 ` Jeff King 2018-01-10 9:36 ` [PATCH v2 11/18] cat-file: start use ref_array_item struct Olga Telezhnaya 2018-01-10 9:36 ` [PATCH v2 16/18] ref_format: add split_on_whitespace flag Olga Telezhnaya 2018-01-10 9:36 ` [PATCH v2 18/18] ref-filter: make cat_file_info independent Olga Telezhnaya 2018-01-10 9:36 ` [PATCH v2 02/18] cat-file: reuse struct ref_format Olga Telezhnaya 2018-01-15 21:37 ` Jeff King 2018-01-16 9:45 ` Оля Тележная 2018-01-10 9:36 ` [PATCH v2 07/18] cat-file: remove unused code Olga Telezhnaya 2018-01-10 9:36 ` [PATCH v2 17/18] cat-file: move skip_object_info into ref-filter Olga Telezhnaya 2018-01-10 9:36 ` [PATCH v2 15/18] ref-filter: add is_cat flag Olga Telezhnaya 2018-01-10 9:36 ` [PATCH v2 12/18] ref-filter: make populate_value global Olga Telezhnaya 2018-01-10 9:36 ` [PATCH v2 04/18] cat-file: move struct expand_data into ref-filter Olga Telezhnaya 2018-01-15 21:44 ` Jeff King 2018-01-16 7:00 ` Оля Тележная 2018-01-17 21:45 ` Jeff King 2018-01-18 5:56 ` Оля Тележная 2018-01-10 9:36 ` Olga Telezhnaya [this message] 2018-01-10 9:36 ` [PATCH v2 08/18] ref-filter: get rid of goto Olga Telezhnaya 2018-01-10 9:36 ` [PATCH v2 13/18] cat-file: start reusing populate_value Olga Telezhnaya 2018-01-10 9:36 ` [PATCH v2 14/18] ref-filter: get rid of expand_atom_into_fields Olga Telezhnaya 2018-01-10 9:36 ` [PATCH v2 10/18] cat-file: get rid of duplicate checking Olga Telezhnaya 2018-01-10 9:36 ` [PATCH v2 05/18] cat-file: start migrating to ref-filter Olga Telezhnaya 2018-01-15 21:33 ` [PATCH v2 01/18] cat-file: split expand_atom into 2 functions Jeff King 2018-01-15 22:09 ` Jeff King 2018-01-16 7:22 ` Оля Тележная 2018-01-17 21:49 ` Jeff King 2018-01-17 23:04 ` Christian Couder 2018-01-18 6:22 ` Оля Тележная 2018-01-18 8:45 ` Christian Couder
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=01020160df6dc548-3213651c-f87e-40f6-80b3-4fe2ee9131be-000000@eu-west-1.amazonses.com \ --to=olyatelezhnaya@gmail.com \ --cc=git@vger.kernel.org \ --subject='Re: [PATCH v2 06/18] ref-filter: reuse parse_ref_filter_atom' \ /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
Code repositories for project(s) associated with this 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).