From: Karthik Nayak <karthik.188@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, sunshine@sunshineco.com,
Karthik Nayak <Karthik.188@gmail.com>
Subject: [PATCH v6 07/11] ref-filter: introduce align_atom_parser()
Date: Wed, 17 Feb 2016 23:36:15 +0530 [thread overview]
Message-ID: <1455732379-22479-8-git-send-email-Karthik.188@gmail.com> (raw)
In-Reply-To: <1455732379-22479-1-git-send-email-Karthik.188@gmail.com>
Introduce align_atom_parser() which will parse an 'align' atom and
store the required alignment position and width in the 'used_atom'
structure for further usage in populate_value().
Since this patch removes the last usage of match_atom_name(), remove
the function from ref-filter.c.
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Helped-by: Jeff King <peff@peff.net>
Helped-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
Signed-off-by: Karthik Nayak <Karthik.188@gmail.com>
---
ref-filter.c | 91 ++++++++++++++++++++++++++----------------------------------
1 file changed, 40 insertions(+), 51 deletions(-)
diff --git a/ref-filter.c b/ref-filter.c
index e8b076d..797f9fe 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -16,6 +16,11 @@
typedef enum { FIELD_STR, FIELD_ULONG, FIELD_TIME } cmp_type;
+struct align {
+ align_type position;
+ unsigned int width;
+};
+
/*
* An atom is a valid field atom listed below, possibly prefixed with
* a "*" to denote deref_tag().
@@ -31,6 +36,7 @@ static struct used_atom {
cmp_type type;
union {
char color[COLOR_MAXLEN];
+ struct align align;
} u;
} *used_atom;
static int used_atom_cnt, need_tagged, need_symref;
@@ -55,6 +61,37 @@ static align_type parse_align_position(const char *s)
return -1;
}
+static void align_atom_parser(struct used_atom *atom, const char *arg)
+{
+ struct align *align = &atom->u.align;
+ struct string_list params = STRING_LIST_INIT_DUP;
+ int i;
+ unsigned int width = ~0U;
+
+ if (!arg)
+ die(_("expected format: %%(align:<width>,<position>)"));
+
+ align->position = ALIGN_LEFT;
+
+ string_list_split(¶ms, arg, ',', -1);
+ for (i = 0; i < params.nr; i++) {
+ const char *s = params.items[i].string;
+ int position;
+
+ if (!strtoul_ui(s, 10, &width))
+ ;
+ else if ((position = parse_align_position(s)) >= 0)
+ align->position = position;
+ else
+ die(_("unrecognized %%(align) argument: %s"), s);
+ }
+
+ if (width == ~0U)
+ die(_("positive width expected with the %%(align) atom"));
+ align->width = width;
+ string_list_clear(¶ms, 0);
+}
+
static struct {
const char *name;
cmp_type cmp_type;
@@ -93,17 +130,12 @@ static struct {
{ "flag" },
{ "HEAD" },
{ "color", FIELD_STR, color_atom_parser },
- { "align" },
+ { "align", FIELD_STR, align_atom_parser },
{ "end" },
};
#define REF_FORMATTING_STATE_INIT { 0, NULL }
-struct align {
- align_type position;
- unsigned int width;
-};
-
struct contents {
unsigned int lines;
struct object_id oid;
@@ -288,22 +320,6 @@ static void end_atom_handler(struct atom_value *atomv, struct ref_formatting_sta
pop_stack_element(&state->stack);
}
-static int match_atom_name(const char *name, const char *atom_name, const char **val)
-{
- const char *body;
-
- if (!skip_prefix(name, atom_name, &body))
- return 0; /* doesn't even begin with "atom_name" */
- if (!body[0]) {
- *val = NULL; /* %(atom_name) and no customization */
- return 1;
- }
- if (body[0] != ':')
- return 0; /* "atom_namefoo" is not "atom_name" or "atom_name:..." */
- *val = body + 1; /* "atom_name:val" */
- return 1;
-}
-
/*
* In a format string, find the next occurrence of %(atom).
*/
@@ -845,7 +861,6 @@ static void populate_value(struct ref_array_item *ref)
int deref = 0;
const char *refname;
const char *formatp;
- const char *valp;
struct branch *branch = NULL;
v->handler = append_atom;
@@ -909,34 +924,8 @@ static void populate_value(struct ref_array_item *ref)
else
v->s = " ";
continue;
- } else if (match_atom_name(name, "align", &valp)) {
- struct align *align = &v->u.align;
- struct string_list params = STRING_LIST_INIT_DUP;
- int i;
- int width = -1;
-
- if (!valp)
- die(_("expected format: %%(align:<width>,<position>)"));
-
- align->position = ALIGN_LEFT;
-
- string_list_split(¶ms, valp, ',', -1);
- for (i = 0; i < params.nr; i++) {
- const char *s = params.items[i].string;
- int position;
-
- if (!strtoul_ui(s, 10, (unsigned int *)&width))
- ;
- else if ((position = parse_align_position(s)) >= 0)
- align->position = position;
- else
- die(_("improper format entered align:%s"), s);
- }
-
- if (width < 0)
- die(_("positive width expected with the %%(align) atom"));
- align->width = width;
- string_list_clear(¶ms, 0);
+ } else if (starts_with(name, "align")) {
+ v->u.align = atom->u.align;
v->handler = align_atom_handler;
continue;
} else if (!strcmp(name, "end")) {
--
2.7.1
next prev parent reply other threads:[~2016-02-17 18:06 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-17 18:06 [PATCH v6 00/11] ref-filter: use parsing functions Karthik Nayak
2016-02-17 18:06 ` [PATCH v6 01/11] ref-filter: use string_list_split over strbuf_split Karthik Nayak
2016-02-17 22:11 ` Eric Sunshine
2016-02-17 22:14 ` Jeff King
2016-02-17 22:19 ` Junio C Hamano
2016-02-17 22:21 ` Eric Sunshine
2016-02-17 22:26 ` Jeff King
2016-02-18 14:19 ` Karthik Nayak
2016-02-17 18:06 ` [PATCH v6 02/11] ref-filter: bump 'used_atom' and related code to the top Karthik Nayak
2016-02-17 18:06 ` [PATCH v6 03/11] ref-filter: introduce struct used_atom Karthik Nayak
2016-02-17 18:06 ` [PATCH v6 04/11] ref-filter: introduce parsing functions for each valid atom Karthik Nayak
2016-02-17 18:06 ` [PATCH v6 05/11] ref-filter: introduce color_atom_parser() Karthik Nayak
2016-02-17 18:06 ` [PATCH v6 06/11] ref-filter: introduce parse_align_position() Karthik Nayak
2016-02-17 18:06 ` Karthik Nayak [this message]
2016-02-17 18:06 ` [PATCH v6 08/11] ref-filter: align: introduce long-form syntax Karthik Nayak
2016-02-17 18:06 ` [PATCH v6 09/11] ref-filter: introduce remote_ref_atom_parser() Karthik Nayak
2016-02-17 18:06 ` [PATCH v6 10/11] ref-filter: introduce contents_atom_parser() Karthik Nayak
2016-02-17 18:06 ` [PATCH v6 11/11] ref-filter: introduce objectname_atom_parser() Karthik Nayak
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1455732379-22479-8-git-send-email-Karthik.188@gmail.com \
--to=karthik.188@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sunshine@sunshineco.com \
/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.
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 NNTP newsgroup(s).