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

Re: [PATCH] grep: use OPT_INTEGER_F for --max-depth

From
René Scharfe <l.s.r@web.de>
Date
Sep 9, 2023, 21:14 UTC
Message-ID
<e09ce805-056c-c3fb-6955-69b6ae0a2cb1@web.de>
In-Reply-To
<cec47733-5b15-6ca7-adaf-7f3216ad178b@web.de>
Am 09.09.23 um 00:28 schrieb René Scharfe:
Show 33 quoted lines
> Am 07.09.23 um 22:40 schrieb Jeff King:
>
> I was thinking more about something like the solutions discussed at
> https://stackoverflow.com/questions/47674663/variable-arguments-inside-a-macro.
> It allows selecting variants based on argument count.
>
> That could look like this (untested except on https://godbolt.org/; the
> EVALs are needed for MSVC for some reason):
>
> #define OPT_INTEGER_FULL(s, l, v, h, f, d) { \
> 	.type = OPTION_INTEGER, \
> 	.short_name = (s), \
> 	.long_name = (l), \
> 	.value = (v), \
> 	.argh = N_("n"), \
> 	.help = (h), \
> 	.flags = (f), \
> 	.defval = (d), \
> }
> #define OPT_INTEGER_4(s, l, v, h) \
> 	OPT_INTEGER_FULL(s, l, v, h, 0, 0)
> #define OPT_INTEGER_5(s, l, v, h, f) \
> 	OPT_INTEGER_FULL(s, l, v, h, f, 0)
> #define OPT_INTEGER_6(s, l, v, h, f, d) \
> 	OPT_INTEGER_FULL(s, l, v, h, (f) | PARSE_OPT_OPTARG, d)
> #define EVAL(x) x
> #define SEVENTH(_1, _2, _3, _4, _5, _6, x, ...) x
> #define OPT_INTEGER(...) \
> 	EVAL(EVAL(SEVENTH(__VA_ARGS__, OPT_INTEGER_6, OPT_INTEGER_5, OPT_INTEGER_4, 0))(__VA_ARGS__))
>
> So OPT_INTEGER(s, l, v, h) would be the same as before.  Add an argument
> and it becomes current OPT_INTEGER_F, add another one and it acts as
> your _OPTARG_F variant.

Should we actually do something like that? Probably not. At least it doesn't help with my goals of simplicity and safety. (I get sidetracked so easily..)

Show 15 quoted lines
>> So yeah, I think you'd really want a separate macro. The combinations
>> start to add up (or multiply up, if you prefer ;) ). They _could_ be
>> generated mechanically, I think, as they can all be implemented in terms
>> of a master macro that knows about all features:
>>
>>    #define OPT_BOOL_F(s, l, v, h, f) OPT_BOOL_ALL(s, l, v, h, f, 0)
>>    #define OPT_BOOL(s, l, v, h, f) OPT_BOOL_F(s, l, v, h, 0)
>
> The "f" arg needs to go...
>
>>    #define OPT_BOOL_OPTARG_F(s, l, v, h, arg) OPT_BOOL_ALL(s, l, v, h, f | PARSE_OPT_OPTARG, arg)
>
> ... here, possibly.
>
>>    #define OPT_BOOL_OPTARG(s, l, v, h, arg) OPT_BOOL_OPTARG_F(s, l, v, h, 0, arg)

Or we could use designated initializers directly. It would improve readability at the cost of some verbosity. We could make it a bit less verbose by by setting some flags implicitly based on type (e.g. set PARSE_OPT_OPTARG if defval is set for an OPTION_INTEGER option).

René
Previous: René ScharfeNext: Jeff King
Message 6 of 7 in “grep: use OPT_INTEGER_F for --max-depth”
  1. grep: use OPT_INTEGER_F for --max-depthRené Scharfe, Sep 2, 2023
  2. Jeff KingSep 5, 2023
  3. René ScharfeSep 7, 2023
  4. Jeff KingSep 7, 2023
  5. René ScharfeSep 8, 2023
  6. René ScharfeSep 9, 2023
  7. Jeff KingSep 12, 2023

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.