Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 20:33:03 +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

102
src/getargs.c
View File

@@ -62,7 +62,57 @@ int language_prio = default_prio;
struct bison_language const *language = &valid_languages[0];
const char *include = NULL;
/** Decode an option's key.
*
* \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 arg the subarguments to decode.
* 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 clears all flags from \c all and no-KEY sets all
* flags from \c all. Thus no-none = all and no-all = none.
*/
static void
flag_argmatch (const char *option,
const char * const keys[], const int values[],
int all, int *flags, char *arg, size_t no, size_t err)
{
int value = 0;
if (!err || arg[no + err++] != '\0')
value = XARGMATCH (option, arg + no + err, keys, values);
if (value)
{
if (no)
*flags &= ~value;
else
{
if (err)
warnings_flag |= value;
*flags |= value;
}
}
else
{
/* With a simpler 'if (no)' version, -Werror means -Werror=all
(or rather, -Werror=no-none, but that syntax is invalid).
The difference is:
- Werror activates all errors, but not the warnings
- Werror=all activates errors, and all warnings */
if (no ? !err : err)
*flags |= all;
else
*flags &= ~all;
}
}
/** Decode an option's set of keys.
*
* \param option option being decoded.
@@ -72,10 +122,6 @@ const char *include = NULL;
* \param flags the flags to update
* \param args comma separated list of effective subarguments to decode.
* If 0, then activate all the flags.
*
* 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
* flags from \c all. Thus no-none = all and no-all = none.
*/
static void
flags_argmatch (const char *option,
@@ -83,47 +129,15 @@ flags_argmatch (const char *option,
int all, int *flags, char *args)
{
if (args)
{
args = strtok (args, ",");
while (args)
{
int value = 0;
int *save_flags = flags;
int no = STRPREFIX_LIT ("no-", args) ? 3 : 0;
int err = STRPREFIX_LIT ("error", args + no) ? 5 : 0;
for (args = strtok (args, ","); args; args = strtok (NULL, ","))
{
size_t no = STRPREFIX_LIT ("no-", args) ? 3 : 0;
size_t err = STRPREFIX_LIT ("error", args + no) ? 5 : 0;
if (err)
flags = &errors_flag;
if (!err || args[no + err++] != '\0')
value = XARGMATCH (option, args + no + err, keys, values);
if (!value)
{
/* With a simpler 'if (no)' version, -Werror means -Werror=all
(or rather, -Werror=no-none, but that syntax is invalid).
The difference is:
- Werror activates all errors, but not the warnings
- Werror=all activates errors, and all warnings */
if (no ? !err : err)
*flags |= all;
else
*flags &= ~all;
}
else
{
if (no)
*flags &= ~value;
else
{
if (err)
warnings_flag |= value;
*flags |= value;
}
}
flags = save_flags;
args = strtok (NULL, ",");
}
}
flag_argmatch (option, keys,
values, all, err ? &errors_flag : flags,
args, no, err);
}
else
*flags |= all;
}