Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-23 03:03:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

warnings: separate flags_argmatch

Browse Source 
This function is now a mere iterator that calls flag_argmatch,
a new function, that matches a single option parameter.

* src/getargs.c (flag_argmatch): New, taken from...
(flags_argmatch): Here.

Signed-off-by: Akim Demaille <akim@lrde.epita.fr>
This commit is contained in:
Theophile Ranquet
2012-10-01 15:01:03 +00:00
committed by Akim Demaille
parent a686f6cdc0
commit 20964c33f9
1 changed files with 58 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/getargs.c
View File

@@ -62,42 +62,45 @@ int language_prio = default_prio;
struct bison_language const *language = &valid_languages[0]; struct bison_language const *language = &valid_languages[0];
const char *include = NULL; const char *include = NULL;
/** Decode an option's key.
/** Decode an option's set of keys.
* *
* \param option option being decoded. * \param option option being decoded.
* \param keys array of valid subarguments. * \param keys array of valid subarguments.
* \param values array of corresponding (int) values. * \param values array of corresponding (int) values.
* \param all the all value. * \param all the all value.
* \param flags the flags to update * \param flags the flags to update
* \param args comma separated list of effective subarguments to decode. * \param arg the subarguments to decode.
* If 0, then activate all the flags. * If null, then activate all the flags.
* \param no length of the potential "no-" prefix.
* Can be 0 or 3. If 3, negate the action of the subargument.
* \param err length of a potential "error=".
* Can be 0 or 6. If 6, treat the subargument as a CATEGORY
* *
* If VALUE != 0 then KEY sets flags and no-KEY clears them. * If VALUE != 0 then KEY sets flags and no-KEY clears them.
* If VALUE == 0 then KEY clears all flags from \c all and no-KEY sets all * If VALUE == 0 then KEY clears all flags from \c all and no-KEY sets all
* flags from \c all. Thus no-none = all and no-all = none. * flags from \c all. Thus no-none = all and no-all = none.
*/ */
static void static void
flags_argmatch (const char *option, flag_argmatch (const char *option,
const char * const keys[], const int values[], const char * const keys[], const int values[],
int all, int *flags, char *args) int all, int *flags, char *arg, size_t no, size_t err)
{
if (args)
{
args = strtok (args, ",");
while (args)
{ {
int value = 0; int value = 0;
int *save_flags = flags; if (!err || arg[no + err++] != '\0')
int no = STRPREFIX_LIT ("no-", args) ? 3 : 0; value = XARGMATCH (option, arg + no + err, keys, values);
int err = STRPREFIX_LIT ("error", args + no) ? 5 : 0;
if (value)
{
if (no)
*flags &= ~value;
else
{
if (err) if (err)
flags = &errors_flag; warnings_flag |= value;
if (!err || args[no + err++] != '\0') *flags |= value;
value = XARGMATCH (option, args + no + err, keys, values); }
}
if (!value) else
{ {
/* With a simpler 'if (no)' version, -Werror means -Werror=all /* With a simpler 'if (no)' version, -Werror means -Werror=all
(or rather, -Werror=no-none, but that syntax is invalid). (or rather, -Werror=no-none, but that syntax is invalid).
@@ -109,20 +112,31 @@ flags_argmatch (const char *option,
else else
*flags &= ~all; *flags &= ~all;
} }
else }
/** Decode an option's set of keys.
*
* \param option option being decoded.
* \param keys array of valid subarguments.
* \param values array of corresponding (int) values.
* \param all the all value.
* \param flags the flags to update
* \param args comma separated list of effective subarguments to decode.
* If 0, then activate all the flags.
*/
static void
flags_argmatch (const char *option,
const char * const keys[], const int values[],
int all, int *flags, char *args)
{ {
if (no) if (args)
*flags &= ~value; for (args = strtok (args, ","); args; args = strtok (NULL, ","))
else
{ {
if (err) size_t no = STRPREFIX_LIT ("no-", args) ? 3 : 0;
warnings_flag |= value; size_t err = STRPREFIX_LIT ("error", args + no) ? 5 : 0;
*flags |= value;
} flag_argmatch (option, keys,
} values, all, err ? &errors_flag : flags,
flags = save_flags; args, no, err);
args = strtok (NULL, ",");
}
} }
else else
*flags |= all; *flags |= all;