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

reader: reduce the "scope" of global variables

Browse Source 
We have too many global variables, adding structure would help.  For a
start, let's hide some of the variables closer to their usage.

* src/getargs.c, src/files.h (current_file): Move to...
* src/scan-gram.c: here.
* src/scan-gram.h (gram_in, gram__flex_debug): Remove, make them
private to the scanner.
* src/reader.h, src/reader.c (reader): Take a grammar file as argument.
Move the handling of scanner variables to...
* src/scan-gram.l (gram_scanner_open, gram_scanner_close): here.
(gram_scanner_initialize): Remove, replaced by gram_scanner_open.
* src/main.c: Adjust.
This commit is contained in:
Akim Demaille
2019-10-22 09:03:00 +02:00
parent a5fc4e3b44
commit 8228d96d33
8 changed files with 30 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/reader.c
View File

@@ -710,24 +710,20 @@ packgram (void)
`------------------------------------------------------------------*/
void
reader (void)
reader (const char *gram)
{
/* Set up symbol_table, semantic_type_table, and the built-in
symbols. */
symbols_new ();
gram_in = xfopen (grammar_file, "r");
gram__flex_debug = trace_flag & trace_scan;
gram_debug = trace_flag & trace_parse;
gram_scanner_initialize ();
gram_scanner_open (gram);
gram_parse ();
gram_scanner_close ();
prepare_percent_define_front_end_variables ();
if (complaint_status < status_complaint)
check_and_convert_grammar ();
xfclose (gram_in);
}
static void