Re: [RFC/PATCH 7/9] parse-options.h: add macros for '--contains' option

From: Karthik Nayak <karthik.188@gmail.com>
Date: Jun 9, 2015, 12:49 UTC
Message-ID: <5576E0EF.3080301@gmail.com>
In-Reply-To: <xmqqr3pm9et4.fsf@gitster.dls.corp.google.com>

On 06/09/2015 01:02 AM, Junio C Hamano wrote:

Show 23 quoted lines

> Karthik Nayak <karthik.188@gmail.com> writes:
>
>> +#define OPT_CONTAINS(filter, h) \
>> +	{ OPTION_CALLBACK, 0, "contains", (filter), N_("commit"), (h), \
>> +	  PARSE_OPT_LASTARG_DEFAULT, \
>> +	  parse_opt_with_commit, (intptr_t) "HEAD" \
>> +	}
>> +#define OPT_WITH(filter, h) \
>> +	{ OPTION_CALLBACK, 0, "with", (filter), N_("commit"), (h), \
>> +	  PARSE_OPT_LASTARG_DEFAULT, \
>> +	  parse_opt_with_commit, (intptr_t) "HEAD" \
>> +	}
>
> The redundancy bothers me.  Can't we do a bit better than that,
> perhaps like this?
>
> #define _OPT_CONTAINS_OR_WITH(name, variable, help) \
> 	{ OPTION_CALLBACK, 0, name, (variable), N_("commit"), (help), \
> 	  PARSE_OPT_LASTARG_DEFAULT, \
> 	  parse_opt_with_commit, (intptr_t) "HEAD" \
> 	}
> #define OPT_CONTAINS(v, h) _OPT_CONTAINS_OR_WITH("contains", v, h)
>

This seems better, thanks!

-- 
Regards,
Karthik