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

* src/options.h, src/options.c (create_long_option_table): Rename

Browse Source 
as...
(long_option_table_new): this, with a clearer prototype.
(percent_table): Remove, unused,
* src/getargs.c (getargs): Adjust.
This commit is contained in:
Akim Demaille
2001-12-29 14:21:06 +00:00
parent 29e8831621
commit f51cb8ff8c
5 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -1,3 +1,12 @@
2001-12-29 Akim Demaille <akim@epita.fr>
* src/options.h, src/options.c (create_long_option_table): Rename
as...
(long_option_table_new): this, with a clearer prototype.
(percent_table): Remove, unused,
* src/getargs.c (getargs): Adjust.
2001-12-29 Akim Demaille <akim@epita.fr> 2001-12-29 Akim Demaille <akim@epita.fr>
* src/LR0.c, src/conflicts.c, src/lalr.c, src/lalr.h, src/output.c * src/LR0.c, src/conflicts.c, src/lalr.c, src/lalr.h, src/output.c

5
src/getargs.c
View File

@@ -135,7 +135,7 @@ getargs (int argc, char *argv[])
{ {
int c; int c;
create_long_option_table (); struct option *longopts = long_option_table_new ();
while ((c = getopt_long (argc, argv, shortopts, longopts, NULL)) != EOF) while ((c = getopt_long (argc, argv, shortopts, longopts, NULL)) != EOF)
switch (c) switch (c)
{ {
@@ -217,7 +217,8 @@ getargs (int argc, char *argv[])
exit (1); exit (1);
} }
XFREE (longopts); free (longopts);
if (optind == argc) if (optind == argc)
{ {
fprintf (stderr, _("%s: no grammar file given\n"), program_name); fprintf (stderr, _("%s: no grammar file given\n"), program_name);

36
src/options.c
View File

@@ -30,11 +30,6 @@
/* Shorts options. */ /* Shorts options. */
const char *shortopts = "yvegdhrltknVo:b:p:S:"; const char *shortopts = "yvegdhrltknVo:b:p:S:";
/* Long options. */
struct option *longopts = NULL;
struct percent_table_struct *percent_table = NULL;
/* A CLI option only. /* A CLI option only.
Arguments is the policy: `no', `optional', `required'. Arguments is the policy: `no', `optional', `required'.
OptionChar is the value given to the Var if the latter is specified. */ OptionChar is the value given to the Var if the latter is specified. */
@@ -135,13 +130,16 @@ const struct option_table_struct option_table[] =
{0, 0, 0, 0, 0, 0} {0, 0, 0, 0, 0, 0}
}; };
/*--------------------------------------------------------. /*--------------------------------------------------------.
| Create the longoptions structure from the option_table, | | Create the longoptions structure from the option_table, |
| for the getopt file. | | for the getopt file. |
`--------------------------------------------------------*/ `--------------------------------------------------------*/
void
create_long_option_table () struct option *
long_option_table_new ()
{ {
struct option *res = NULL;
int i = 0; int i = 0;
int j = 0; int j = 0;
int number_options; int number_options;
@@ -151,26 +149,28 @@ create_long_option_table ()
|| option_table[i].access == opt_both) || option_table[i].access == opt_both)
++number_options; ++number_options;
longopts = XMALLOC (struct option, number_options + 1); res = XMALLOC (struct option, number_options + 1);
for (i = 0; option_table[i].name; i++) for (i = 0; option_table[i].name; i++)
if (option_table[i].access == opt_cmd_line if (option_table[i].access == opt_cmd_line
|| option_table[i].access == opt_both) || option_table[i].access == opt_both)
{ {
/* Copy the struct information in the longoptions. */ /* Copy the struct information in the longoptions. */
longopts[j].name = option_table[i].name; res[j].name = option_table[i].name;
longopts[j].has_arg = option_table[i].has_arg; res[j].has_arg = option_table[i].has_arg;
/* When an options is declared having 'optional_argument' and /* When an options is declared having 'optional_argument' and
a flag is specified to be set, the option is skipped on a flag is specified to be set, the option is skipped on
command line. So we never use a flag when a command line command line. So we never use a flag when a command line
option is declared 'optional_argument. */ option is declared 'optional_argument. */
if (longopts[j].has_arg == optional_argument) if (res[j].has_arg == optional_argument)
longopts[j].flag = NULL; res[j].flag = NULL;
else else
longopts[j].flag = option_table[i].set_flag; res[j].flag = option_table[i].set_flag;
longopts[j++].val = option_table[i].val; res[j++].val = option_table[i].val;
} }
longopts[number_options].name = NULL; res[number_options].name = NULL;
longopts[number_options].has_arg = 0; res[number_options].has_arg = 0;
longopts[number_options].flag = NULL; res[number_options].flag = NULL;
longopts[number_options].val = 0; res[number_options].val = 0;
return res;
} }

3
src/options.h
View File

@@ -51,12 +51,11 @@ struct option_table_struct
}; };
extern const char *shortopts; extern const char *shortopts;
extern struct option *longopts;
/* Table which contain all options. */ /* Table which contain all options. */
extern const struct option_table_struct option_table[]; extern const struct option_table_struct option_table[];
/* Set the longopts variable from option_table. */ /* Set the longopts variable from option_table. */
void create_long_option_table PARAMS ((void)); struct option *long_option_table_new PARAMS ((void));
#endif /* !OPTIONS_H_ */ #endif /* !OPTIONS_H_ */

1
src/reduce.c
View File

@@ -337,7 +337,6 @@ static void
nonterminals_reduce (void) nonterminals_reduce (void)
{ {
int i, n; int i, n;
rule r;
/* Map the nonterminals to their new index: useful first, useless /* Map the nonterminals to their new index: useful first, useless
afterwards. Kept for later report. */ afterwards. Kept for later report. */