git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v4 04/12] ref-filter: introduce struct used_atom

From
Karthik Nayak <karthik.188@gmail.com>
Date
Jan 31, 2016, 17:42 UTC
Message-ID
<1454262176-6594-5-git-send-email-Karthik.188@gmail.com>
In-Reply-To
<1454262176-6594-1-git-send-email-Karthik.188@gmail.com>

Introduce the 'used_atom' structure to replace the existing implementation of 'used_atom' (which is a list of atoms). This helps us parse atoms beforehand and store required details into the 'used_atom' for future usage.

Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Karthik Nayak <Karthik.188@gmail.com>
---
 ref-filter.c | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/ref-filter.c b/ref-filter.c
index c3a8372..3736dc3 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -26,8 +26,10 @@ typedef enum { FIELD_STR, FIELD_ULONG, FIELD_TIME } cmp_type;
  * indexed with the "atom number", which is an index into this
  * array.
  */
-static const char **used_atom;
-static cmp_type *used_atom_type;
+static struct used_atom {
+	const char *name;
+	cmp_type type;
+} *used_atom;
 static int used_atom_cnt, need_tagged, need_symref;
 static int need_color_reset_at_eol;
 
@@ -122,8 +124,8 @@ int parse_ref_filter_atom(const char *atom, const char *ep)
 
 	/* Do we have the atom already used elsewhere? */
 	for (i = 0; i < used_atom_cnt; i++) {
-		int len = strlen(used_atom[i]);
-		if (len == ep - atom && !memcmp(used_atom[i], atom, len))
+		int len = strlen(used_atom[i].name);
+		if (len == ep - atom && !memcmp(used_atom[i].name, atom, len))
 			return i;
 	}
 
@@ -150,12 +152,11 @@ int parse_ref_filter_atom(const char *atom, const char *ep)
 	at = used_atom_cnt;
 	used_atom_cnt++;
 	REALLOC_ARRAY(used_atom, used_atom_cnt);
-	REALLOC_ARRAY(used_atom_type, used_atom_cnt);
-	used_atom[at] = xmemdupz(atom, ep - atom);
-	used_atom_type[at] = valid_atom[i].cmp_type;
+	used_atom[at].name = xmemdupz(atom, ep - atom);
+	used_atom[at].type = valid_atom[i].cmp_type;
 	if (*atom == '*')
 		need_tagged = 1;
-	if (!strcmp(used_atom[at], "symref"))
+	if (!strcmp(used_atom[at].name, "symref"))
 		need_symref = 1;
 	return at;
 }
@@ -315,7 +316,7 @@ int verify_ref_format(const char *format)
 		at = parse_ref_filter_atom(sp + 2, ep);
 		cp = ep + 1;
 
-		if (skip_prefix(used_atom[at], "color:", &color))
+		if (skip_prefix(used_atom[at].name, "color:", &color))
 			need_color_reset_at_eol = !!strcmp(color, "reset");
 	}
 	return 0;
@@ -359,7 +360,7 @@ static void grab_common_values(struct atom_value *val, int deref, struct object
 	int i;
 
 	for (i = 0; i < used_atom_cnt; i++) {
-		const char *name = used_atom[i];
+		const char *name = used_atom[i].name;
 		struct atom_value *v = &val[i];
 		if (!!deref != (*name == '*'))
 			continue;
@@ -383,7 +384,7 @@ static void grab_tag_values(struct atom_value *val, int deref, struct object *ob
 	struct tag *tag = (struct tag *) obj;
 
 	for (i = 0; i < used_atom_cnt; i++) {
-		const char *name = used_atom[i];
+		const char *name = used_atom[i].name;
 		struct atom_value *v = &val[i];
 		if (!!deref != (*name == '*'))
 			continue;
@@ -405,7 +406,7 @@ static void grab_commit_values(struct atom_value *val, int deref, struct object
 	struct commit *commit = (struct commit *) obj;
 
 	for (i = 0; i < used_atom_cnt; i++) {
-		const char *name = used_atom[i];
+		const char *name = used_atom[i].name;
 		struct atom_value *v = &val[i];
 		if (!!deref != (*name == '*'))
 			continue;
@@ -535,7 +536,7 @@ static void grab_person(const char *who, struct atom_value *val, int deref, stru
 	const char *wholine = NULL;
 
 	for (i = 0; i < used_atom_cnt; i++) {
-		const char *name = used_atom[i];
+		const char *name = used_atom[i].name;
 		struct atom_value *v = &val[i];
 		if (!!deref != (*name == '*'))
 			continue;
@@ -573,7 +574,7 @@ static void grab_person(const char *who, struct atom_value *val, int deref, stru
 	if (!wholine)
 		return;
 	for (i = 0; i < used_atom_cnt; i++) {
-		const char *name = used_atom[i];
+		const char *name = used_atom[i].name;
 		struct atom_value *v = &val[i];
 		if (!!deref != (*name == '*'))
 			continue;
@@ -663,7 +664,7 @@ static void grab_sub_body_contents(struct atom_value *val, int deref, struct obj
 	unsigned long sublen = 0, bodylen = 0, nonsiglen = 0, siglen = 0;
 
 	for (i = 0; i < used_atom_cnt; i++) {
-		const char *name = used_atom[i];
+		const char *name = used_atom[i].name;
 		struct atom_value *v = &val[i];
 		const char *valp = NULL;
 		if (!!deref != (*name == '*'))
@@ -809,7 +810,7 @@ static void populate_value(struct ref_array_item *ref)
 
 	/* Fill in specials first */
 	for (i = 0; i < used_atom_cnt; i++) {
-		const char *name = used_atom[i];
+		const char *name = used_atom[i].name;
 		struct atom_value *v = &ref->value[i];
 		int deref = 0;
 		const char *refname;
@@ -1464,7 +1465,7 @@ static int cmp_ref_sorting(struct ref_sorting *s, struct ref_array_item *a, stru
 {
 	struct atom_value *va, *vb;
 	int cmp;
-	cmp_type cmp_type = used_atom_type[s->atom];
+	cmp_type cmp_type = used_atom[s->atom].type;
 
 	get_ref_atom_value(a, s->atom, &va);
 	get_ref_atom_value(b, s->atom, &vb);

-- 
2.7.0
Previous: Karthik NayakNext: Karthik Nayak
Message 8 of 46 in “ref-filter: use parsing functions”
  1. 00/12 ref-filter: use parsing functionsKarthik Nayak, Jan 31, 2016
  2. 01/12 strbuf: introduce strbuf_split_str_omit_term()Karthik Nayak, Jan 31, 2016
  3. 02/12 ref-filter: use strbuf_split_str_omit_term()Karthik Nayak, Jan 31, 2016
  4. 03/12 ref-filter: bump 'used_atom' and related code to the topKarthik Nayak, Jan 31, 2016
  5. Junio C HamanoFeb 1, 2016
  6. Karthik NayakFeb 2, 2016
  7. 03/12 ref-filter: bump 'used_atom' and related code to the topKarthik Nayak, Feb 2, 2016
  8. 04/12 ref-filter: introduce struct used_atomKarthik Nayak, Jan 31, 2016
  9. 05/12 ref-filter: introduce parsing functions for each valid atomKarthik Nayak, Jan 31, 2016
  10. Eric SunshineFeb 3, 2016
  11. Junio C HamanoFeb 4, 2016
  12. Karthik NayakFeb 6, 2016
  13. Eric SunshineFeb 7, 2016
  14. Karthik NayakFeb 7, 2016
  15. Karthik NayakFeb 6, 2016
  16. Eric SunshineFeb 7, 2016
  17. Karthik NayakFeb 7, 2016
  18. Eric SunshineFeb 7, 2016
  19. Andreas SchwabFeb 7, 2016
  20. Karthik NayakFeb 9, 2016
  21. 06/12 ref-filter: introduce color_atom_parser()Karthik Nayak, Jan 31, 2016
  22. Eric SunshineFeb 4, 2016
  23. Karthik NayakFeb 6, 2016
  24. Christian CouderFeb 6, 2016
  25. Eric SunshineFeb 7, 2016
  26. Eric SunshineFeb 7, 2016
  27. Karthik NayakFeb 7, 2016
  28. 07/12 ref-filter: introduce parse_align_position()Karthik Nayak, Jan 31, 2016
  29. 08/12 ref-filter: introduce align_atom_parser()Karthik Nayak, Jan 31, 2016
  30. Eric SunshineFeb 4, 2016
  31. Karthik NayakFeb 6, 2016
  32. 09/12 ref-filter: align: introduce long-form syntaxKarthik Nayak, Jan 31, 2016
  33. Eric SunshineFeb 5, 2016
  34. Karthik NayakFeb 6, 2016
  35. 11/12 ref-filter: introduce contents_atom_parser()Karthik Nayak, Jan 31, 2016
  36. Eric SunshineFeb 5, 2016
  37. Karthik NayakFeb 7, 2016
  38. 12/12 ref-filter: introduce objectname_atom_parser()Karthik Nayak, Jan 31, 2016
  39. Junio C HamanoFeb 1, 2016
  40. Eric SunshineFeb 2, 2016
  41. Karthik NayakFeb 2, 2016
  42. Eric SunshineFeb 5, 2016
  43. Eric SunshineFeb 2, 2016
  44. Karthik NayakFeb 2, 2016
  45. Eric SunshineFeb 5, 2016
  46. Karthik NayakFeb 6, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.