[PATCH v9 02/11] ref-filter: introduce ref_formatting_state

From

Karthik Nayak <karthik.188@gmail.com>

Date

Aug 4, 2015, 12:42 UTC

Message-ID

<1438692188-14367-2-git-send-email-Karthik.188@gmail.com>

In-Reply-To

<1438692188-14367-1-git-send-email-Karthik.188@gmail.com>

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 | 64 +++++++++++++++++++++++++++++++++++++++++-------------------
 ref-filter.h |  5 +++++
 2 files changed, 49 insertions(+), 20 deletions(-)

diff --git a/ref-filter.c b/ref-filter.c
index 91482c9..2c074a1 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -1190,23 +1190,23 @@ void ref_array_sort(struct ref_sorting *sorting, struct ref_array *array)
 	qsort(array->items, array->nr, sizeof(struct ref_array_item *), compare_refs);
 }
 
-static void print_value(struct atom_value *v, int quote_style, struct strbuf *output)
+static void print_value(struct atom_value *v, struct ref_formatting_state *state)
 {
-	switch (quote_style) {
+	switch (state->quote_style) {
 	case QUOTE_NONE:
-		strbuf_addstr(output, v->s);
+		strbuf_addstr(state->output, v->s);
 		break;
 	case QUOTE_SHELL:
-		sq_quote_buf(output, v->s);
+		sq_quote_buf(state->output, v->s);
 		break;
 	case QUOTE_PERL:
-		perl_quote_buf(output, v->s);
+		perl_quote_buf(state->output, v->s);
 		break;
 	case QUOTE_PYTHON:
-		python_quote_buf(output, v->s);
+		python_quote_buf(state->output, v->s);
 		break;
 	case QUOTE_TCL:
-		tcl_quote_buf(output, v->s);
+		tcl_quote_buf(state->output, v->s);
 		break;
 	}
 }
@@ -1229,7 +1229,7 @@ static int hex2(const char *cp)
 		return -1;
 }
 
-static void emit(const char *cp, const char *ep, struct strbuf *output)
+static void emit(const char *cp, const char *ep, struct ref_formatting_state *state)
 {
 	while (*cp && (!ep || cp < ep)) {
 		if (*cp == '%') {
@@ -1238,35 +1238,58 @@ static void emit(const char *cp, const char *ep, struct strbuf *output)
 			else {
 				int ch = hex2(cp + 1);
 				if (0 <= ch) {
-					strbuf_addch(output, ch);
+					strbuf_addch(state->output, ch);
 					cp += 3;
 					continue;
 				}
 			}
 		}
-		strbuf_addch(output, *cp);
+		strbuf_addch(state->output, *cp);
 		cp++;
 	}
 }
 
+static void process_formatting_state(struct atom_value *atomv, struct ref_formatting_state *state)
+{
+	/* Based on the atomv values, the formatting state is set */
+}
+
+static void apply_formatting_state(struct ref_formatting_state *state, struct strbuf *final)
+{
+	/* More formatting options to be evetually added */
+	strbuf_addbuf(final, state->output);
+	strbuf_release(state->output);
+}
+
 void show_ref_array_item(struct ref_array_item *info, const char *format, int quote_style)
 {
 	const char *cp, *sp, *ep;
-	struct strbuf output = STRBUF_INIT;
+	struct strbuf value = STRBUF_INIT;
+	struct strbuf final_buf = STRBUF_INIT;
+	struct ref_formatting_state state;
 	int i;
 
+	memset(&state, 0, sizeof(state));
+	state.quote_style = quote_style;
+	state.output = &value;
+
 	for (cp = format; *cp && (sp = find_next(cp)); cp = ep + 1) {
-		struct atom_value *atomv;
+		struct atom_value *atomv = NULL;
 
 		ep = strchr(sp, ')');
-		if (cp < sp)
-			emit(cp, sp, &output);
+		if (cp < sp) {
+			emit(cp, sp, &state);
+			apply_formatting_state(&state, &final_buf);
+		}
 		get_ref_atom_value(info, parse_ref_filter_atom(sp + 2, ep), &atomv);
-		print_value(atomv, quote_style, &output);
+		process_formatting_state(atomv, &state);
+		print_value(atomv, &state);
+		apply_formatting_state(&state, &final_buf);
 	}
 	if (*cp) {
 		sp = cp + strlen(cp);
-		emit(cp, sp, &output);
+		emit(cp, sp, &state);
+		apply_formatting_state(&state, &final_buf);
 	}
 	if (need_color_reset_at_eol) {
 		struct atom_value resetv;
@@ -1275,12 +1298,13 @@ 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;
-		print_value(&resetv, quote_style, &output);
+		print_value(&resetv, &state);
+		apply_formatting_state(&state, &final_buf);
 	}
-	for (i = 0; i < output.len; i++)
-		printf("%c", output.buf[i]);
+	for (i = 0; i < final_buf.len; i++)
+		printf("%c", final_buf.buf[i]);
 	putchar('\n');
-	strbuf_release(&output);
+	strbuf_release(&final_buf);
 }
 
 /*  If no sorting option is given, use refname to sort as default */
diff --git a/ref-filter.h b/ref-filter.h
index 6bf27d8..9e6c2d4 100644
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -16,6 +16,11 @@
 #define FILTER_REFS_INCLUDE_BROKEN 0x1
 #define FILTER_REFS_ALL 0x2
 
+struct ref_formatting_state {
+	int quote_style;
+	struct strbuf *output;
+};
+
 struct atom_value {
 	const char *s;
 	unsigned long ul; /* used for sorting when not FIELD_STR */

-- 
2.5.0