From: Karthik Nayak <karthik.188@gmail.com>
To: git@vger.kernel.org
Cc: christian.couder@gmail.com, Matthieu.Moy@grenoble-inp.fr,
gitster@pobox.com, Karthik Nayak <Karthik.188@gmail.com>,
Karthik Nayak <karthik.188@gmail.com>
Subject: [PATCH v12 03/13] ref-filter: introduce the ref_formatting_state stack machinery
Date: Wed, 19 Aug 2015 00:07:22 +0530 [thread overview]
Message-ID: <1439923052-7373-4-git-send-email-Karthik.188@gmail.com> (raw)
In-Reply-To: <1439923052-7373-1-git-send-email-Karthik.188@gmail.com>
Introduce a stack machinery for ref_formatting_state, this allows us
to push and pop states. Whenever we pop a state the strbuf from that
state is appended into the next state on the stack, this will allow us
to support nesting of modifier atoms.
Mentored-by: Christian Couder <christian.couder@gmail.com>
Mentored-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Signed-off-by: Karthik Nayak <karthik.188@gmail.com>
---
ref-filter.c | 42 +++++++++++++++++++++++++++++++++---------
1 file changed, 33 insertions(+), 9 deletions(-)
diff --git a/ref-filter.c b/ref-filter.c
index dd62640..74532d3 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -56,6 +56,7 @@ static struct {
};
struct ref_formatting_state {
+ struct ref_formatting_state *prev;
struct strbuf output;
int quote_style;
};
@@ -134,6 +135,27 @@ int parse_ref_filter_atom(const char *atom, const char *ep)
return at;
}
+static void push_new_state(struct ref_formatting_state **stack)
+{
+ struct ref_formatting_state *s = xcalloc(1, sizeof(struct ref_formatting_state));
+
+ strbuf_init(&s->output, 0);
+ s->prev = *stack;
+ *stack = s;
+}
+
+static void pop_state(struct ref_formatting_state **stack)
+{
+ struct ref_formatting_state *current = *stack;
+ struct ref_formatting_state *prev = current->prev;
+
+ if (prev)
+ strbuf_addbuf(&prev->output, ¤t->output);
+ strbuf_release(¤t->output);
+ free(current);
+ *stack = prev;
+}
+
/*
* In a format string, find the next occurrence of %(atom).
*/
@@ -1262,23 +1284,24 @@ static void append_literal(const char *cp, const char *ep, struct ref_formatting
void show_ref_array_item(struct ref_array_item *info, const char *format, int quote_style)
{
const char *cp, *sp, *ep;
- struct ref_formatting_state state;
+ struct strbuf *final_buf;
+ struct ref_formatting_state *state = NULL;
- strbuf_init(&state.output, 0);
- state.quote_style = quote_style;
+ push_new_state(&state);
+ state->quote_style = quote_style;
for (cp = format; *cp && (sp = find_next(cp)); cp = ep + 1) {
struct atom_value *atomv;
ep = strchr(sp, ')');
if (cp < sp)
- append_literal(cp, sp, &state);
+ append_literal(cp, sp, state);
get_ref_atom_value(info, parse_ref_filter_atom(sp + 2, ep), &atomv);
- append_atom(atomv, &state);
+ append_atom(atomv, state);
}
if (*cp) {
sp = cp + strlen(cp);
- append_literal(cp, sp, &state);
+ append_literal(cp, sp, state);
}
if (need_color_reset_at_eol) {
struct atom_value resetv;
@@ -1287,11 +1310,12 @@ void show_ref_array_item(struct ref_array_item *info, const char *format, int qu
if (color_parse("reset", color) < 0)
die("BUG: couldn't parse 'reset' as a color");
resetv.s = color;
- append_atom(&resetv, &state);
+ append_atom(&resetv, state);
}
- fwrite(state.output.buf, 1, state.output.len, stdout);
+ final_buf = &state->output;
+ fwrite(final_buf->buf, 1, final_buf->len, stdout);
+ pop_state(&state);
putchar('\n');
- strbuf_release(&state.output);
}
/* If no sorting option is given, use refname to sort as default */
--
2.5.0
next prev parent reply other threads:[~2015-08-18 18:37 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-18 18:37 [PATCH v12 00/13] port tag.c to use ref-filter.c APIs Karthik Nayak
2015-08-18 18:37 ` [PATCH v12 01/13] ref-filter: move `struct atom_value` to ref-filter.c Karthik Nayak
2015-08-19 14:56 ` Matthieu Moy
2015-08-19 15:29 ` Karthik Nayak
2015-08-18 18:37 ` [PATCH v12 02/13] ref-filter: introduce ref_formatting_state Karthik Nayak
2015-08-18 18:37 ` Karthik Nayak [this message]
2015-08-19 14:56 ` [PATCH v12 03/13] ref-filter: introduce the ref_formatting_state stack machinery Matthieu Moy
2015-08-19 15:39 ` Karthik Nayak
2015-08-19 15:44 ` Matthieu Moy
2015-08-19 15:54 ` Karthik Nayak
2015-08-19 16:10 ` Karthik Nayak
2015-08-20 7:29 ` Matthieu Moy
2015-08-20 10:29 ` Karthik Nayak
2015-08-20 16:47 ` Junio C Hamano
2015-08-20 17:19 ` Matthieu Moy
2015-08-20 18:29 ` Junio C Hamano
2015-08-19 18:52 ` Junio C Hamano
2015-08-20 10:31 ` Karthik Nayak
2015-08-20 16:51 ` Junio C Hamano
2015-08-18 18:37 ` [PATCH v12 04/13] utf8: add function to align a string into given strbuf Karthik Nayak
2015-08-18 18:37 ` [PATCH v12 05/13] ref-filter: implement an `align` atom Karthik Nayak
2015-08-18 19:28 ` Karthik Nayak
2015-08-20 20:23 ` Eric Sunshine
2015-08-21 1:55 ` Karthik Nayak
2015-08-18 18:37 ` [PATCH v12 06/13] ref-filter: add option to filter out tags, branches and remotes Karthik Nayak
2015-08-18 18:37 ` [PATCH v12 07/13] ref-filter: support printing N lines from tag annotation Karthik Nayak
2015-08-18 18:37 ` [PATCH v12 08/13] ref-filter: add support to sort by version Karthik Nayak
2015-08-18 18:37 ` [PATCH v12 09/13] ref-filter: add option to match literal pattern Karthik Nayak
2015-08-18 18:37 ` [PATCH v12 10/13] tag.c: use 'ref-filter' data structures Karthik Nayak
2015-08-19 14:56 ` Matthieu Moy
2015-08-19 15:51 ` Karthik Nayak
2015-08-18 18:37 ` [PATCH v12 11/13] tag.c: use 'ref-filter' APIs Karthik Nayak
2015-08-18 18:37 ` [PATCH v12 12/13] tag.c: implement '--format' option Karthik Nayak
2015-08-19 14:53 ` Matthieu Moy
2015-08-20 15:50 ` Karthik Nayak
2015-08-18 18:37 ` [PATCH v12 13/13] tag.c: implement '--merged' and '--no-merged' options Karthik Nayak
2015-08-18 19:18 ` [PATCH v12 00/13] port tag.c to use ref-filter.c APIs Eric Sunshine
2015-08-18 19:25 ` 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=1439923052-7373-4-git-send-email-Karthik.188@gmail.com \
--to=karthik.188@gmail.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).