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 <sunsh...@sunshineco.com>
Helped-by: Ramsay Jones <ram...@ramsayjones.plus.com>
Signed-off-by: Karthik Nayak <karthik....@gmail.com>
---
ref-filter.c | 91 ++++++++++++++++++++++++++----------------------------------
1 file changed, 40 insertions(+), 51 deletions(-)
diff --git a/ref-filter.c b/ref-filter.c
index e6b6b55..79a7e07 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 strbuf **s, **to_free;
+ unsigned int width = ~0U;
+
+ if (!arg)
+ die(_("expected format: %%(align:<width>,<position>)"));
+ s = to_free = strbuf_split_str_omit_term(arg, ',', 0);
+
+ align->position = ALIGN_LEFT;
+
+ while (*s) {
+ int position;
+ arg = s[0]->buf;
+
+ if (!strtoul_ui(arg, 10, &width))
+ ;
+ else if ((position = parse_align_position(arg)) >= 0)
+ align->position = position;
+ else
+ die(_("unrecognized %%(align) argument: %s"), arg);
+ s++;
+ }
+
+ if (width == ~0U)
+ die(_("positive width expected with the %%(align) atom"));
+ align->width = width;
+ strbuf_list_free(to_free);
+}
+
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;
@@ -287,22 +319,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).
*/
@@ -844,7 +860,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;
@@ -908,34 +923,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 strbuf **s, **to_free;
- int width = -1;
-
- if (!valp)
- die(_("expected format:
%%(align:<width>,<position>)"));
-
- s = to_free = strbuf_split_str_omit_term(valp, ',', 0);
-
- align->position = ALIGN_LEFT;
-
- while (*s) {
- int position;
-
- if (!strtoul_ui(s[0]->buf, 10, (unsigned int
*)&width))
- ;
- else if ((position =
parse_align_position(s[0]->buf)) >= 0)
- align->position = position;
- else
- die(_("improper format entered
align:%s"), s[0]->buf);
- s++;
- }
-
- if (width < 0)
- die(_("positive width expected with the
%%(align) atom"));
- align->width = width;
- strbuf_list_free(to_free);
+ } 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.0
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
