git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 04/11] ref-filter: introduce parsing functions for each valid atom
Date: Wed, 17 Feb 2016 23:36:12 +0530	[thread overview]
Message-ID: <1455732379-22479-5-git-send-email-Karthik.188@gmail.com> (raw)
In-Reply-To: <1455732379-22479-1-git-send-email-Karthik.188@gmail.com>

Parsing atoms is done in populate_value(), this is repetitive and
hence expensive. Introduce a parsing function which would let us parse
atoms beforehand and store the required details into the 'used_atom'
structure for further usage.

Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Helped-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
Helped-by: Andreas Schwab <schwab@linux-m68k.org>
Signed-off-by: Karthik Nayak <Karthik.188@gmail.com>
---
 ref-filter.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/ref-filter.c b/ref-filter.c
index 8139709..8a34ba1 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -36,6 +36,7 @@ static int need_color_reset_at_eol;
 static struct {
 	const char *name;
 	cmp_type cmp_type;
+	void (*parser)(struct used_atom *atom, const char *arg);
 } valid_atom[] = {
 	{ "refname" },
 	{ "objecttype" },
@@ -114,6 +115,7 @@ struct atom_value {
 int parse_ref_filter_atom(const char *atom, const char *ep)
 {
 	const char *sp;
+	const char *arg;
 	int i, at;
 
 	sp = atom;
@@ -132,16 +134,16 @@ int parse_ref_filter_atom(const char *atom, const char *ep)
 	/* Is the atom a valid one? */
 	for (i = 0; i < ARRAY_SIZE(valid_atom); i++) {
 		int len = strlen(valid_atom[i].name);
+
 		/*
 		 * If the atom name has a colon, strip it and everything after
 		 * it off - it specifies the format for this entry, and
 		 * shouldn't be used for checking against the valid_atom
 		 * table.
 		 */
-		const char *formatp = strchr(sp, ':');
-		if (!formatp || ep < formatp)
-			formatp = ep;
-		if (len == formatp - sp && !memcmp(valid_atom[i].name, sp, len))
+		arg = memchr(sp, ':', ep - sp);
+		if (len == (arg ? arg : ep) - sp &&
+		    !memcmp(valid_atom[i].name, sp, len))
 			break;
 	}
 
@@ -154,6 +156,10 @@ int parse_ref_filter_atom(const char *atom, const char *ep)
 	REALLOC_ARRAY(used_atom, used_atom_cnt);
 	used_atom[at].name = xmemdupz(atom, ep - atom);
 	used_atom[at].type = valid_atom[i].cmp_type;
+	if (arg)
+		arg = used_atom[at].name + (arg - atom) + 1;
+	if (valid_atom[i].parser)
+		valid_atom[i].parser(&used_atom[at], arg);
 	if (*atom == '*')
 		need_tagged = 1;
 	if (!strcmp(used_atom[at].name, "symref"))
-- 
2.7.1

  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 ` Karthik Nayak [this message]
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 ` [PATCH v6 07/11] ref-filter: introduce align_atom_parser() Karthik Nayak
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-5-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).