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

style: minor changes

Browse Source 
* src/muscle-tab.c: Sort alphabetically.
* src/scan-gram.l: Reduce scopes.
Initialize variables.
This commit is contained in:
Akim Demaille
2019-01-13 12:47:20 +01:00
parent f9db426de6
commit 38b17c36da
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/muscle-tab.c
View File

@@ -444,8 +444,13 @@ muscle_percent_variable_update (char const *variable, location variable_loc,
} conversion_type; } conversion_type;
const conversion_type conversion[] = const conversion_type conversion[] =
{ {
{ "abstract", "api.parser.abstract", muscle_keyword },
{ "annotations", "api.parser.annotations", muscle_code },
{ "api.push_pull", "api.push-pull", muscle_keyword }, { "api.push_pull", "api.push-pull", muscle_keyword },
{ "api.tokens.prefix", "api.token.prefix", muscle_code }, { "api.tokens.prefix", "api.token.prefix", muscle_code },
{ "extends", "api.parser.extends", muscle_keyword },
{ "final", "api.parser.final", muscle_keyword },
{ "implements", "api.parser.implements", muscle_keyword },
{ "lex_symbol", "api.token.constructor", -1 }, { "lex_symbol", "api.token.constructor", -1 },
{ "location_type", "api.location.type", muscle_code }, { "location_type", "api.location.type", muscle_code },
{ "lr.default-reductions", "lr.default-reduction", muscle_keyword }, { "lr.default-reductions", "lr.default-reduction", muscle_keyword },
@@ -453,16 +458,11 @@ muscle_percent_variable_update (char const *variable, location variable_loc,
{ "lr.keep_unreachable_states", "lr.keep-unreachable-state", muscle_keyword }, { "lr.keep_unreachable_states", "lr.keep-unreachable-state", muscle_keyword },
{ "namespace", "api.namespace", muscle_code }, { "namespace", "api.namespace", muscle_code },
{ "parser_class_name", "api.parser.class", muscle_code }, { "parser_class_name", "api.parser.class", muscle_code },
{ "public", "api.parser.public", muscle_keyword },
{ "strictfp", "api.parser.strictfp", muscle_keyword },
{ "stype", "api.value.type", -1 }, { "stype", "api.value.type", -1 },
{ "variant=", "api.value.type=variant", -1 }, { "variant=", "api.value.type=variant", -1 },
{ "variant=true", "api.value.type=variant", -1 }, { "variant=true", "api.value.type=variant", -1 },
{ "abstract", "api.parser.abstract", muscle_keyword },
{ "annotations", "api.parser.annotations", muscle_code },
{ "extends", "api.parser.extends", muscle_keyword },
{ "final", "api.parser.final", muscle_keyword },
{ "implements", "api.parser.implements", muscle_keyword },
{ "public", "api.parser.public", muscle_keyword },
{ "strictfp", "api.parser.strictfp", muscle_keyword },
{ NULL, NULL, -1, } { NULL, NULL, -1, }
}; };

7
src/scan-gram.l
View File

@@ -76,18 +76,17 @@ static size_t no_cr_read (FILE *, char *, size_t);
#define DEPRECATED(Msg) \ #define DEPRECATED(Msg) \
do { \ do { \
size_t i; \
deprecated_directive (loc, yytext, Msg); \ deprecated_directive (loc, yytext, Msg); \
scanner_cursor.column -= mbsnwidth (Msg, strlen (Msg), 0); \ scanner_cursor.column -= mbsnwidth (Msg, strlen (Msg), 0); \
for (i = strlen (Msg); i != 0; --i) \ for (size_t i = strlen (Msg); i != 0; --i) \
unput (Msg[i - 1]); \ unput (Msg[i - 1]); \
} while (0) } while (0)
/* A string representing the most recently saved token. */ /* A string representing the most recently saved token. */
static char *last_string; static char *last_string = NULL;
/* Bracketed identifier. */ /* Bracketed identifier. */
static uniqstr bracketed_id_str = 0; static uniqstr bracketed_id_str = NULL;
static location bracketed_id_loc; static location bracketed_id_loc;
static boundary bracketed_id_start; static boundary bracketed_id_start;
static int bracketed_id_context_state = 0; static int bracketed_id_context_state = 0;