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

style: comment and name changes

Browse Source 
* src/output.c (prepare_symbol_names): here.
* src/reader.c: Remove obsolete comment.
* src/scan-code.l: Use || for Boolean or.
This commit is contained in:
Akim Demaille
2019-02-02 06:43:48 +01:00
parent dc654a925c
commit 9566232422
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/output.c
View File

@@ -137,9 +137,8 @@ string_output (FILE *out, char const *string)
} }
/*----------------------------. /* Generate the b4_<MUSCLE_NAME> (e.g., b4_tname) table with the
| Prepare the symbols names. | symbol names (aka tags). */
`----------------------------*/
static void static void
prepare_symbol_names (char const *muscle_name) prepare_symbol_names (char const *muscle_name)
@@ -430,13 +429,13 @@ prepare_symbol_definitions (void)
key = obstack_finish0 (&format_obstack); key = obstack_finish0 (&format_obstack);
/* Whether the symbol has an identifier. */ /* Whether the symbol has an identifier. */
const char *value = symbol_id_get (sym); const char *id = symbol_id_get (sym);
SET_KEY ("has_id"); SET_KEY ("has_id");
MUSCLE_INSERT_INT (key, !!value); MUSCLE_INSERT_INT (key, !!id);
/* Its identifier. */ /* Its identifier. */
SET_KEY ("id"); SET_KEY ("id");
MUSCLE_INSERT_STRING (key, value ? value : ""); MUSCLE_INSERT_STRING (key, id ? id : "");
/* Its tag. Typically for documentation purpose. */ /* Its tag. Typically for documentation purpose. */
SET_KEY ("tag"); SET_KEY ("tag");

3
src/reader.c
View File

@@ -829,8 +829,7 @@ check_and_convert_grammar (void)
aver (nsyms <= SYMBOL_NUMBER_MAXIMUM); aver (nsyms <= SYMBOL_NUMBER_MAXIMUM);
aver (nsyms == ntokens + nvars); aver (nsyms == ntokens + nvars);
/* Assign the symbols their symbol numbers. Write #defines for the /* Assign the symbols their symbol numbers. */
token symbols into FDEFINES if requested. */
symbols_pack (); symbols_pack ();
/* Scan rule actions after invoking symbol_check_alias_consistency (in /* Scan rule actions after invoking symbol_check_alias_consistency (in

4
src/scan-code.l
View File

@@ -631,7 +631,7 @@ handle_action_dollar (symbol_list *rule, char *text, location dollar_loc)
if (!type_name if (!type_name
&& !sym->content.sym->content->type_name) && !sym->content.sym->content->type_name)
{ {
if (union_seen | tag_seen) if (union_seen || tag_seen)
{ {
if (rule->midrule_parent_rule) if (rule->midrule_parent_rule)
complain (&dollar_loc, complaint, complain (&dollar_loc, complaint,
@@ -665,7 +665,7 @@ handle_action_dollar (symbol_list *rule, char *text, location dollar_loc)
if (!type_name if (!type_name
&& (!sym || !sym->content.sym->content->type_name)) && (!sym || !sym->content.sym->content->type_name))
{ {
if (union_seen | tag_seen) if (union_seen || tag_seen)
complain (&dollar_loc, complaint, complain (&dollar_loc, complaint,
_("$%s of %s has no declared type"), cp, _("$%s of %s has no declared type"), cp,
quote (effective_rule->content.sym->tag)); quote (effective_rule->content.sym->tag));