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

Miscellaneous code readability improvements.

Browse Source 
* src/reader.c (reader): Move %define front-end variable
defaults and checking into...
(prepare_percent_define_front_end_variables): ... this new
function.

* src/scan-gram.l (INITIAL): For consistency with string
literals, don't store open quote on character literal.  It's
discarded before returning anyway.
(SC_ESCAPED_CHARACTER): Similarly, don't store close quote.
Make length test more readable, and make the character stored
for an empty literal more obvious while consistent with the
previous behavior.

* src/symtab.c, src/symtab.h: Rename USER_NUMBER_ALIAS to
USER_NUMBER_HAS_STRING_ALIAS throughout.
* src/symtab.c (symbol_make_alias): Remove comment from symtab.c
that is repeated in symtab.h.  Improve argument names to make it
clear which side of the symbol-string alias pair is which.
(symbol_check_alias_consistency): Improve local variable names
for the same purpose.
* src/symtab.h (struct symbol): Make comments about aliases
clearer.
(symbol_make_alias): Improve comments and argument name.
* src/output.c (token_definitions_output): Update for rename to
USER_NUMBER_HAS_STRING_ALIAS and improve comments about aliases.
(cherry picked from commit dfaa48602d)

Conflicts:

	src/symtab.c
	src/symtab.h
This commit is contained in:
Joel E. Denny
2009-08-10 21:43:07 -04:00
parent 1a323c2f71
commit 07c0db18b4
6 changed files with 113 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/scan-gram.l
View File

@@ -251,7 +251,7 @@ splice (\\[ \f\t\v]*\n)*
}
/* Characters. */
"'" STRING_GROW; token_start = loc->start; BEGIN SC_ESCAPED_CHARACTER;
"'" token_start = loc->start; BEGIN SC_ESCAPED_CHARACTER;
/* Strings. */
"\"" token_start = loc->start; BEGIN SC_ESCAPED_STRING;
@@ -465,16 +465,18 @@ splice (\\[ \f\t\v]*\n)*
<SC_ESCAPED_CHARACTER>
{
"'"|"\n" {
STRING_GROW;
STRING_FINISH;
loc->start = token_start;
val->character = last_string[1];
val->character = last_string[0];
{
/* FIXME: Eventually, make these errors. */
size_t length = strlen (last_string);
if (length < 3)
warn_at (*loc, _("empty character literal"));
else if (length > 3)
if (last_string[0] == '\0')
{
warn_at (*loc, _("empty character literal"));
/* '\0' seems dangerous even if we are about to complain. */
val->character = '\'';
}
else if (last_string[1] != '\0')
warn_at (*loc, _("extra characters in character literal"));
}
if (yytext[0] == '\n')
@@ -486,17 +488,17 @@ splice (\\[ \f\t\v]*\n)*
<<EOF>> {
STRING_FINISH;
loc->start = token_start;
val->character = last_string[0];
{
size_t length = strlen (last_string);
/* FIXME: Eventually, make these errors. */
if (length < 2)
warn_at (*loc, _("empty character literal"));
else if (length > 2)
if (last_string[0] == '\0')
{
warn_at (*loc, _("empty character literal"));
/* '\0' seems dangerous even if we are about to complain. */
val->character = '\'';
}
else if (last_string[1] != '\0')
warn_at (*loc, _("extra characters in character literal"));
if (length > 1)
val->character = last_string[1];
else
val->character = last_string[0];
}
unexpected_eof (token_start, "'");
STRING_FREE;