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

style: avoid lengthy actions

Browse Source 
We also lack a consistent naming for directive implementations.
`directive_skeleton` is too long, `percent_skeleton` is not very nice
looking, `process_skeleton` looks ambiguous, `do_skeleton` is somewhat
ambiguous too, but seems a better track.

* src/parse-gram.y (version_check): Rename as...
(do_require): this.
(do_skeleton): New.
Use it.
This commit is contained in:
Akim Demaille
2018-11-20 13:56:01 +01:00
parent 4e510c69b1
commit e0de1020ea
1 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/parse-gram.y
View File

@@ -82,7 +82,11 @@
string from the scanner (should be CODE). */ string from the scanner (should be CODE). */
static char const *translate_code_braceless (char *code, location loc); static char const *translate_code_braceless (char *code, location loc);
static void version_check (location const *loc, char const *version); /* Handle a %require directive. */
static void do_require (location const *loc, char const *version);
/* Handle a %skeleton directive. */
static void do_skeleton (location const *loc, char const *skel);
static void gram_error (location const *, char const *); static void gram_error (location const *, char const *);
@@ -308,31 +312,8 @@ prologue_declaration:
| "%nondeterministic-parser" { nondeterministic_parser = true; } | "%nondeterministic-parser" { nondeterministic_parser = true; }
| "%output" STRING { spec_outfile = $2; } | "%output" STRING { spec_outfile = $2; }
| "%param" { current_param = $1; } params { current_param = param_none; } | "%param" { current_param = $1; } params { current_param = param_none; }
| "%require" STRING { version_check (&@2, $2); } | "%require" STRING { do_require (&@2, $2); }
| "%skeleton" STRING | "%skeleton" STRING { do_skeleton (&@2, $2); }
{
char const *skeleton_user = $2;
if (strchr (skeleton_user, '/'))
{
size_t dir_length = strlen (current_file);
char *skeleton_build;
while (dir_length && current_file[dir_length - 1] != '/')
--dir_length;
while (dir_length && current_file[dir_length - 1] == '/')
--dir_length;
skeleton_build =
xmalloc (dir_length + 1 + strlen (skeleton_user) + 1);
if (dir_length > 0)
{
memcpy (skeleton_build, current_file, dir_length);
skeleton_build[dir_length++] = '/';
}
strcpy (skeleton_build + dir_length, skeleton_user);
skeleton_user = uniqstr_new (skeleton_build);
free (skeleton_build);
}
skeleton_arg (skeleton_user, grammar_prio, @1);
}
| "%token-table" { token_table_flag = true; } | "%token-table" { token_table_flag = true; }
| "%verbose" { report_flag |= report_states; } | "%verbose" { report_flag |= report_states; }
| "%yacc" { yacc_flag = true; } | "%yacc" { yacc_flag = true; }
@@ -802,7 +783,7 @@ add_param (param_type type, char *decl, location loc)
static void static void
version_check (location const *loc, char const *version) do_require (location const *loc, char const *version)
{ {
/* Changes of behavior are only on minor version changes, so "3.0.5" /* Changes of behavior are only on minor version changes, so "3.0.5"
is the same as "3.0". */ is the same as "3.0". */
@@ -839,6 +820,32 @@ version_check (location const *loc, char const *version)
} }
} }
static void
do_skeleton (location const *loc, char const *skel)
{
char const *skeleton_user = skel;
if (strchr (skeleton_user, '/'))
{
size_t dir_length = strlen (current_file);
while (dir_length && current_file[dir_length - 1] != '/')
--dir_length;
while (dir_length && current_file[dir_length - 1] == '/')
--dir_length;
char *skeleton_build =
xmalloc (dir_length + 1 + strlen (skeleton_user) + 1);
if (dir_length > 0)
{
memcpy (skeleton_build, current_file, dir_length);
skeleton_build[dir_length++] = '/';
}
strcpy (skeleton_build + dir_length, skeleton_user);
skeleton_user = uniqstr_new (skeleton_build);
free (skeleton_build);
}
skeleton_arg (skeleton_user, grammar_prio, *loc);
}
static void static void
gram_error (location const *loc, char const *msg) gram_error (location const *loc, char const *msg)
{ {