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

%parse: support several arguments.

Browse Source 
* src/parse-gram.y (current_param): New.
	(param_type): Add param_none.
	(params): New nonterminal.
	Use it.
This commit is contained in:
Akim Demaille
2009-09-09 15:35:49 +02:00
parent b18cdd91e8
commit eaca4c1103
2 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
2009-09-09 Akim Demaille <demaille@gostai.com>
%parse: support several arguments.
* src/parse-gram.y (current_param): New.
(param_type): Add param_none.
(params): New nonterminal.
Use it.
2009-09-09 Akim Demaille <demaille@gostai.com> 2009-09-09 Akim Demaille <demaille@gostai.com>
Regen. Regen.

26
src/parse-gram.y
View File

@@ -54,12 +54,12 @@ static char const *char_name (char);
%code %code
{ {
static symbol_class current_class = unknown_sym; static int current_prec = 0;
static uniqstr current_type = NULL;
static symbol *current_lhs;
static location current_lhs_location; static location current_lhs_location;
static named_ref *current_lhs_named_ref; static named_ref *current_lhs_named_ref;
static int current_prec = 0; static symbol *current_lhs;
static symbol_class current_class = unknown_sym;
static uniqstr current_type = NULL;
#define YYTYPE_INT16 int_fast16_t #define YYTYPE_INT16 int_fast16_t
#define YYTYPE_INT8 int_fast8_t #define YYTYPE_INT8 int_fast8_t
@@ -203,6 +203,7 @@ static char const *char_name (char);
# define PARAM_TYPE # define PARAM_TYPE
typedef enum typedef enum
{ {
param_none = 0,
param_lex = 1 << 0, param_lex = 1 << 0,
param_parse = 1 << 1, param_parse = 1 << 1,
param_both = param_lex | param_parse param_both = param_lex | param_parse
@@ -218,6 +219,7 @@ static char const *char_name (char);
* \param loc the location in the source. * \param loc the location in the source.
*/ */
static void add_param (param_type type, char *decl, location loc); static void add_param (param_type type, char *decl, location loc);
static param_type current_param = param_none;
}; };
%union %union
{ {
@@ -229,15 +231,18 @@ static char const *char_name (char);
switch ($$) switch ($$)
{ {
#define CASE(In, Out) \ #define CASE(In, Out) \
case param_ ## In: fputs ("%" #Out, stderr); break case param_ ## In: fputs ("%" #Out, stderr); break
CASE(lex, lex-param); CASE(lex, lex-param);
CASE(parse, parse-param); CASE(parse, parse-param);
CASE(both, param); CASE(both, param);
}
#undef CASE #undef CASE
}
} <param>; } <param>;
/*==========\
| Grammar. |
\==========*/
%% %%
input: input:
@@ -311,7 +316,7 @@ prologue_declaration:
| "%nondeterministic-parser" { nondeterministic_parser = true; } | "%nondeterministic-parser" { nondeterministic_parser = true; }
| "%output" STRING { spec_outfile = $2; } | "%output" STRING { spec_outfile = $2; }
| "%output" "=" STRING { spec_outfile = $3; } /* deprecated */ | "%output" "=" STRING { spec_outfile = $3; } /* deprecated */
| "%param" "{...}" { add_param ($1, $2, @2); } | "%param" { current_param = $1; } params { current_param = param_none; }
| "%require" STRING { version_check (&@2, $2); } | "%require" STRING { version_check (&@2, $2); }
| "%skeleton" STRING | "%skeleton" STRING
{ {
@@ -343,6 +348,11 @@ prologue_declaration:
| /*FIXME: Err? What is this horror doing here? */ ";" | /*FIXME: Err? What is this horror doing here? */ ";"
; ;
params:
params "{...}" { add_param (current_param, $2, @2); }
| "{...}" { add_param (current_param, $1, @1); }
;
/*----------------------. /*----------------------.
| grammar_declaration. | | grammar_declaration. |