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

* src/parse-gram.y (declaration): Have %parse-param and %lex-param

Browse Source 
take two BRACED_CODE, not two string_content.
Free the scanner's obstack when we are done.
(code_content): New.
* tests/calc.at: Adjust.
* doc/bison.texinfo: Adjust.
Also, make sure to include the `,' for these declarations.
This commit is contained in:
Akim Demaille
2002-11-15 16:42:16 +00:00
parent 761c1926a1
commit 0f39aab92a
5 changed files with 208 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/parse-gram.y
View File

@@ -158,7 +158,7 @@ braced_code_t current_braced_code = action_braced_code;
%type <string> STRING string_content
BRACED_CODE action
BRACED_CODE code_content action
PROLOGUE EPILOGUE
%type <struniq> TYPE
%type <integer> INT
@@ -194,14 +194,20 @@ declaration:
| "%expect" INT { expected_conflicts = $2; }
| "%file-prefix" "=" string_content { spec_file_prefix = $3; }
| "%glr-parser" { glr_parser = 1; }
| "%lex-param" string_content "," string_content
{ muscle_pair_list_grow ("lex_param", $2, $4); }
| "%lex-param" code_content "," code_content
{
muscle_pair_list_grow ("lex_param", $2, $4);
scanner_last_string_free ();
}
| "%locations" { locations_flag = 1; }
| "%name-prefix" "=" string_content { spec_name_prefix = $3; }
| "%no-lines" { no_lines_flag = 1; }
| "%output" "=" string_content { spec_outfile = $3; }
| "%parse-param" string_content "," string_content
{ muscle_pair_list_grow ("parse_param", $2, $4); }
| "%parse-param" code_content "," code_content
{
muscle_pair_list_grow ("parse_param", $2, $4);
scanner_last_string_free ();
}
| "%pure-parser" { pure_parser = 1; }
| "%skeleton" string_content { skeleton = $2; }
| "%token-table" { token_table_flag = 1; }
@@ -416,6 +422,15 @@ string_content:
};
/* A BRACED_CODE used for its contents. Strip the braces. */
code_content:
BRACED_CODE
{
$$ = $1 + 1;
$$[strlen ($$) - 1] = '\0';
};
epilogue.opt:
/* Nothing. */
| "%%" EPILOGUE