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

* src/options.c (OPTN, DRTV, BOTH): New.

Browse Source 
(option_table): Use them.
* src/muscle_tab.c: Don't include xalloc.h and string.h: that's
the job of system.h.
* src/options.c: Don't include stdio.h and xalloc.h for the same
reasons.
This commit is contained in:
Akim Demaille
2001-12-10 09:06:27 +00:00
parent 5449dd0f25
commit 0edad74997
3 changed files with 74 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@@ -1,3 +1,15 @@
2001-12-10 Akim Demaille <akim@epita.fr>
* src/options.c (OPTN, DRTV, BOTH): New.
(option_table): Use them.
* src/muscle_tab.c: Don't include xalloc.h and string.h: that's
the job of system.h.
* src/options.c: Don't include stdio.h and xalloc.h for the same
reasons.
2001-12-10 Akim Demaille <akim@epita.fr> 2001-12-10 Akim Demaille <akim@epita.fr>
* src/output.c (output, prepare): Make sure the values of the * src/output.c (output, prepare): Make sure the values of the

3
src/muscle_tab.c
View File

@@ -18,9 +18,6 @@
the Free Software Foundation, Inc., 59 Temple Place - Suite 330, the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
#include <string.h>
#include "xalloc.h"
#include "system.h" #include "system.h"
#include "hash.h" #include "hash.h"
#include "files.h" #include "files.h"

113
src/options.c
View File

@@ -18,13 +18,10 @@
the Free Software Foundation, Inc., 59 Temple Place - Suite 330, the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
#include <stdio.h>
#include "xalloc.h"
#include "system.h" #include "system.h"
#include "getopt.h" #include "getopt.h"
#include "files.h" #include "files.h"
#include "getargs.h" #include "getargs.h"
#include "gram.h"
#include "symtab.h" #include "symtab.h"
#include "lex.h" #include "lex.h"
#include "output.h" #include "output.h"
@@ -38,6 +35,27 @@ struct option *longopts = NULL;
struct percent_table_struct *percent_table = NULL; struct percent_table_struct *percent_table = NULL;
/* A CLI option only.
Arguments is the policy: `no', `optional', `required'.
OptionChar is the value given to the Var if the latter is specified. */
#undef OPTN
#define OPTN(OptionString, Arguments, Var, Token, OptionChar) \
{ opt_cmd_line, \
(OptionString), (Arguments##_argument), (Var), (Token), (OptionChar) },
/* A directive only. */
#undef DRTV
#define DRTV(DirectiveString, Arguments, Var, Token) \
{ opt_percent, \
(DirectiveString), (Arguments##_argument), (Var), (Token), (0) },
/* An option activated both by a directive and an CLI option. */
#undef BOTH
#define BOTH(String, Arguments, Var, Token, OptionChar) \
{ opt_both, \
(String), (Arguments##_argument), (Var), (Token), (OptionChar) },
const struct option_table_struct option_table[] = const struct option_table_struct option_table[] =
{ {
/* /*
@@ -45,81 +63,74 @@ const struct option_table_struct option_table[] =
*/ */
/* Operation modes. */ /* Operation modes. */
{opt_cmd_line, "help", no_argument, 0, 0, 'h'}, OPTN ("help", no, 0, 0, 'h')
{opt_cmd_line, "version", no_argument, 0, 0, 'V'}, OPTN ("version", no, 0, 0, 'V')
/* Parser. */ /* Parser. */
/* was 'a'; apparently unused -wjh */ OPTN ("name-prefix", required, 0, 0, 'p')
{opt_cmd_line, "name-prefix", required_argument, 0, 0, 'p'}, OPTN ("include", required, 0, 0, 'I')
{opt_cmd_line, "include", required_argument, 0, 0, 'I'},
/* Output. */ /* Output. */
{opt_cmd_line, "file-prefix", required_argument, 0, 0, 'b'}, OPTN ("file-prefix", required, 0, 0, 'b')
{opt_cmd_line, "output", required_argument, 0, 0, 'o'}, OPTN ("output", required, 0, 0, 'o')
{opt_cmd_line, "output-file", required_argument, 0, 0, 'o'}, OPTN ("output-file", required, 0, 0, 'o')
{opt_cmd_line, "graph", optional_argument, 0, 0, 'g'}, OPTN ("graph", optional, 0, 0, 'g')
/* Hidden. */ /* Hidden. */
/* Fixme: What is this `1' doing here!!! Sounds dead wrong. See OPTN ("trace", no, &trace_flag, 0, 1)
locations too below. */
{opt_cmd_line, "trace", no_argument, &trace_flag, 0, 1},
/* /*
* Percent declarations. * Percent declarations.
*/ */
{opt_percent, "token", 0, NULL, tok_token, 0}, DRTV ("token", no, NULL, tok_token)
{opt_percent, "term", 0, NULL, tok_token, 0}, DRTV ("term", no, NULL, tok_token)
{opt_percent, "nterm", 0, NULL, tok_nterm, 0}, DRTV ("nterm", no, NULL, tok_nterm)
{opt_percent, "type", 0, NULL, tok_type, 0}, DRTV ("type", no, NULL, tok_type)
{opt_percent, "guard", 0, NULL, tok_guard, 0}, DRTV ("guard", no, NULL, tok_guard)
{opt_percent, "union", 0, NULL, tok_union, 0}, DRTV ("union", no, NULL, tok_union)
{opt_percent, "expect", 0, NULL, tok_expect, 0}, DRTV ("expect", no, NULL, tok_expect)
{opt_percent, "thong", 0, NULL, tok_thong, 0}, DRTV ("thong", no, NULL, tok_thong)
{opt_percent, "start", 0, NULL, tok_start, 0}, DRTV ("start", no, NULL, tok_start)
{opt_percent, "left", 0, NULL, tok_left, 0}, DRTV ("left", no, NULL, tok_left)
{opt_percent, "right", 0, NULL, tok_right, 0}, DRTV ("right", no, NULL, tok_right)
{opt_percent, "nonassoc", 0, NULL, tok_nonassoc, 0}, DRTV ("nonassoc", no, NULL, tok_nonassoc)
{opt_percent, "binary", 0, NULL, tok_nonassoc, 0}, DRTV ("binary", no, NULL, tok_nonassoc)
{opt_percent, "prec", 0, NULL, tok_prec, 0}, DRTV ("prec", no, NULL, tok_prec)
{opt_percent, "error-verbose", 0, &error_verbose, tok_intopt, 0}, DRTV ("error-verbose",no, &error_verbose, tok_intopt)
/* FIXME: semantic parsers will output an `include' of an /* FIXME: semantic parsers will output an `include' of an
output file: be sure that the naem included is indeed the name of output file: be sure that the naem included is indeed the name of
the output file. */ /* FIXME Should we activate this options ? the output file. */ /* FIXME Should we activate this options ?
*/ */
{opt_both, "output", required_argument, &spec_outfile, tok_stropt, 'o'}, BOTH ("output", required, &spec_outfile, tok_stropt, 'o')
{opt_both, "file-prefix", required_argument,&spec_file_prefix,tok_stropt,'b'}, BOTH ("file-prefix", required, &spec_file_prefix, tok_stropt, 'b')
{opt_both, "name-prefix", required_argument,&spec_name_prefix,tok_stropt,'p'}, BOTH ("name-prefix", required, &spec_name_prefix, tok_stropt, 'p')
{opt_percent, "define", 0, NULL, tok_define, 0}, DRTV ("define", no, NULL, tok_define)
{opt_percent, "semantic-parser", 0, &semantic_parser, tok_intopt, 0}, DRTV ("semantic-parser",no, &semantic_parser, tok_intopt)
{opt_percent, "pure-parser", 0, &pure_parser, tok_intopt, 0}, DRTV ("pure-parser", no, &pure_parser, tok_intopt)
/* /*
* Percent and command line declarations. * Percent and command line declarations.
*/ */
/* FIXME Usually option use `-' to separe words on command line
and `_' for percent option. But here the separator are always
the same, the char `-'. */
/* Output. */ /* Output. */
{opt_both, "defines", optional_argument, &defines_flag, tok_intopt, 'd'}, BOTH ("defines", optional, &defines_flag, tok_intopt, 'd')
{opt_both, "verbose", no_argument, &verbose_flag, tok_intopt, 'v'}, BOTH ("verbose", no, &verbose_flag, tok_intopt, 'v')
/* Operation modes. */ /* Operation modes. */
{opt_both, "fixed-output-files", no_argument, &yacc_flag, tok_intopt, 'y'}, BOTH ("fixed-output-files", no, &yacc_flag, tok_intopt, 'y')
{opt_both, "yacc", no_argument, &yacc_flag, tok_intopt, 'y'}, BOTH ("yacc", no, &yacc_flag, tok_intopt, 'y')
/* Parser. */ /* Parser. */
{opt_both, "debug", no_argument, &debug_flag, tok_intopt, 't'}, BOTH ("debug", no, &debug_flag, tok_intopt, 't')
{opt_both, "locations", no_argument, &locations_flag, tok_intopt, 1}, BOTH ("locations", no, &locations_flag, tok_intopt, 1)
{opt_both, "no-lines", no_argument, &no_lines_flag, tok_intopt, 'l'}, BOTH ("no-lines", no, &no_lines_flag, tok_intopt, 'l')
{opt_both, "no-parser", no_argument, &no_parser_flag, tok_intopt, 'n'}, BOTH ("no-parser", no, &no_parser_flag, tok_intopt, 'n')
{opt_both, "raw", no_argument, 0, tok_obsolete, 'r'}, BOTH ("raw", no, 0, tok_obsolete, 'r')
{opt_both, "skeleton", required_argument, 0, tok_skel, 'S'}, BOTH ("skeleton", required, 0, tok_skel, 'S')
{opt_both, "token-table", no_argument, &token_table_flag, tok_intopt, 'k'}, BOTH ("token-table", no, &token_table_flag, tok_intopt, 'k')
{0, 0, 0, 0, 0, 0} {0, 0, 0, 0, 0, 0}
}; };