From mboxrd@z Thu Jan 1 00:00:00 1970 From: Karthik Nayak Subject: [PATCH v2 03/11] ref-filter: introduce struct used_atom Date: Wed, 16 Dec 2015 20:59:54 +0530 Message-ID: <1450279802-29414-4-git-send-email-Karthik.188@gmail.com> References: <1450279802-29414-1-git-send-email-Karthik.188@gmail.com> Cc: gitster@pobox.com, sunshine@sunshineco.com, Karthik Nayak To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Wed Dec 16 16:29:56 2015 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1a9E1b-0001Nn-9N for gcvg-git-2@plane.gmane.org; Wed, 16 Dec 2015 16:29:55 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934108AbbLPP3u (ORCPT ); Wed, 16 Dec 2015 10:29:50 -0500 Received: from mail-pa0-f42.google.com ([209.85.220.42]:32976 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933118AbbLPP3s (ORCPT ); Wed, 16 Dec 2015 10:29:48 -0500 Received: by mail-pa0-f42.google.com with SMTP id ur14so25130274pab.0 for ; Wed, 16 Dec 2015 07:29:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=x1GgjF2CxXmkMoGwHJ9+YmdZz3nhUJn3Azc163T0h0w=; b=pylozN/pkbXbeOtkNTyNJIJGFYW9JAB7laLtVhBOkGH4xeH0swNuKGXc/nIS27DQw3 aPwKS6qBsiGtMQRx/Qkp3vxAqa2jP5keFE5O0YNTJ8nrNTXeb/7CnWVd/y52TXJJJAl7 Egjk1bt1iRI/PujiiJIMDxoZQOPsZWZ7TD9OoSeRqdFEpBc0cay/7TpJTpOpsRUAo7ns HWhKYpeZs3HB2rnwJ0pv2bzBtUM/u1DHykFLCvDdyH3lCzLZqSo6nYHAXQVJhNQfWY4a KTZxabw54ktVf8rGOOwfhkhOM3JOhZMnKbo2CQ/tk4742myRRFA2gYsJfUyq2DAdIrLq 5FGQ== X-Received: by 10.66.156.106 with SMTP id wd10mr64397615pab.150.1450279788246; Wed, 16 Dec 2015 07:29:48 -0800 (PST) Received: from ashley.localdomain ([106.51.233.145]) by smtp.gmail.com with ESMTPSA id x12sm5620612pfi.95.2015.12.16.07.29.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Dec 2015 07:29:47 -0800 (PST) X-Google-Original-From: Karthik Nayak X-Mailer: git-send-email 2.6.4 In-Reply-To: <1450279802-29414-1-git-send-email-Karthik.188@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Introduce the 'used_array' structure which would replace the existing implementation of 'used_array' (which a list of atoms). This helps us parse atom's before hand and store required details into the 'used_array' for future usage. Also introduce a parsing function for each atom in valid_atom. Using this we can define special parsing functions for each of the atoms. Signed-off-by: Karthik Nayak --- ref-filter.c | 63 +++++++++++++++++++++++++++++++----------------------------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/ref-filter.c b/ref-filter.c index 6263710..043a02a 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -16,9 +16,27 @@ typedef enum { FIELD_STR, FIELD_ULONG, FIELD_TIME } cmp_type; +/* + * An atom is a valid field atom listed below, possibly prefixed with + * a "*" to denote deref_tag(). + * + * We parse given format string and sort specifiers, and make a list + * of properties that we need to extract out of objects. ref_array_item + * structure will hold an array of values extracted that can be + * indexed with the "atom number", which is an index into this + * array. + */ +static struct used_atom { + const char *str; + cmp_type type; +} *used_atom; +static int used_atom_cnt, need_tagged, need_symref; +static int need_color_reset_at_eol; + static struct { const char *name; cmp_type cmp_type; + void (*parser)(struct used_atom *atom); } valid_atom[] = { { "refname" }, { "objecttype" }, @@ -92,21 +110,6 @@ struct atom_value { }; /* - * An atom is a valid field atom listed above, possibly prefixed with - * a "*" to denote deref_tag(). - * - * We parse given format string and sort specifiers, and make a list - * of properties that we need to extract out of objects. ref_array_item - * structure will hold an array of values extracted that can be - * indexed with the "atom number", which is an index into this - * array. - */ -static const char **used_atom; -static cmp_type *used_atom_type; -static int used_atom_cnt, need_tagged, need_symref; -static int need_color_reset_at_eol; - -/* * Used to parse format string and sort specifiers */ int parse_ref_filter_atom(const char *atom, const char *ep) @@ -122,8 +125,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].str); + if (len == ep - atom && !memcmp(used_atom[i].str, atom, len)) return i; } @@ -150,12 +153,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].str = 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].str, "symref")) need_symref = 1; return at; } @@ -315,7 +317,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].str, "color:", &color)) need_color_reset_at_eol = !!strcmp(color, "reset"); } return 0; @@ -359,7 +361,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].str; struct atom_value *v = &val[i]; if (!!deref != (*name == '*')) continue; @@ -383,7 +385,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].str; struct atom_value *v = &val[i]; if (!!deref != (*name == '*')) continue; @@ -405,7 +407,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].str; struct atom_value *v = &val[i]; if (!!deref != (*name == '*')) continue; @@ -535,7 +537,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].str; struct atom_value *v = &val[i]; if (!!deref != (*name == '*')) continue; @@ -573,7 +575,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].str; struct atom_value *v = &val[i]; if (!!deref != (*name == '*')) continue; @@ -663,7 +665,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].str; struct atom_value *v = &val[i]; const char *valp = NULL; if (!!deref != (*name == '*')) @@ -786,7 +788,8 @@ 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]; + struct used_atom *atom = &used_atom[i]; + const char *name = atom->str; struct atom_value *v = &ref->value[i]; int deref = 0; const char *refname; @@ -1438,7 +1441,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.6.4