diff options
author | Maarten De Braekeleer <maarten.debraekeleer@gmail.com> | 2020-07-30 20:53:35 +0200 |
---|---|---|
committer | Akim Demaille <akim.demaille@gmail.com> | 2020-08-02 08:32:57 +0200 |
commit | ad6f600bb1bf16fc8aa89dced17dcdec77594542 (patch) | |
tree | d4d89e1d0a9d7c5a8331e2dba685435a2a6cbc1a | |
parent | de4f41eab7ae95c897e2026b1889789b8e618d00 (diff) | |
download | bison-ad6f600bb1bf16fc8aa89dced17dcdec77594542.tar.gz |
portability: rename accept to acceptsymbol because of MSVC
MSVC already defines this symbol.
* src/symtab.h, src/symtab.c (accept): Rename as...
(acceptsymbol): this.
Adjust dependencies.
-rw-r--r-- | src/ielr.c | 2 | ||||
-rw-r--r-- | src/reader.c | 2 | ||||
-rw-r--r-- | src/reduce.c | 8 | ||||
-rw-r--r-- | src/symtab.c | 10 | ||||
-rw-r--r-- | src/symtab.h | 2 |
5 files changed, 12 insertions, 12 deletions
@@ -423,7 +423,7 @@ ielr_item_has_lookahead (state *s, symbol_number lhs, size_t item, check all predecessors' goto follows for the LHS. */ if (item_number_is_rule_number (ritem[s->items[item] - 2])) { - aver (lhs != accept->content->number); + aver (lhs != acceptsymbol->content->number); for (state **predecessor = predecessors[s->number]; *predecessor; ++predecessor) diff --git a/src/reader.c b/src/reader.c index 2d142331..29222ef3 100644 --- a/src/reader.c +++ b/src/reader.c @@ -804,7 +804,7 @@ check_and_convert_grammar (void) $accept: %start $end. */ { - symbol_list *p = symbol_list_sym_new (accept, empty_loc); + symbol_list *p = symbol_list_sym_new (acceptsymbol, empty_loc); p->rhs_loc = grammar->rhs_loc; p->next = symbol_list_sym_new (startsymbol, empty_loc); p->next->next = symbol_list_sym_new (eoftoken, empty_loc); diff --git a/src/reduce.c b/src/reduce.c index 24d2f376..0061b687 100644 --- a/src/reduce.c +++ b/src/reduce.c @@ -160,9 +160,9 @@ inaccessable_symbols (void) bitset Pp = bitset_create (nrules, BITSET_FIXED); /* If the start symbol isn't useful, then nothing will be useful. */ - if (bitset_test (N, accept->content->number - ntokens)) + if (bitset_test (N, acceptsymbol->content->number - ntokens)) { - bitset_set (V, accept->content->number); + bitset_set (V, acceptsymbol->content->number); while (1) { @@ -301,7 +301,7 @@ nonterminals_reduce (void) for (item_number *rhsp = rules[r].rhs; 0 <= *rhsp; ++rhsp) if (ISVAR (*rhsp)) *rhsp = symbol_number_as_item_number (nterm_map[*rhsp - ntokens]); - accept->content->number = nterm_map[accept->content->number - ntokens]; + acceptsymbol->content->number = nterm_map[acceptsymbol->content->number - ntokens]; } nsyms -= nuseless_nonterminals; @@ -381,7 +381,7 @@ reduce_grammar (void) { reduce_print (); - if (!bitset_test (N, accept->content->number - ntokens)) + if (!bitset_test (N, acceptsymbol->content->number - ntokens)) complain (&startsymbol_loc, fatal, _("start symbol %s does not derive any sentence"), startsymbol->tag); diff --git a/src/symtab.c b/src/symtab.c index d5a00c02..e04349a2 100644 --- a/src/symtab.c +++ b/src/symtab.c @@ -59,7 +59,7 @@ static semantic_type **semantic_types_sorted = NULL; symbol *errtoken = NULL; symbol *undeftoken = NULL; symbol *eoftoken = NULL; -symbol *accept = NULL; +symbol *acceptsymbol = NULL; symbol *startsymbol = NULL; location startsymbol_loc; @@ -849,10 +849,10 @@ symbols_new (void) hash_symbol_comparator, symbol_free); - /* Construct the accept symbol. */ - accept = symbol_get ("$accept", empty_loc); - accept->content->class = nterm_sym; - accept->content->number = nnterms++; + /* Construct the acceptsymbol symbol. */ + acceptsymbol = symbol_get ("$accept", empty_loc); + acceptsymbol->content->class = nterm_sym; + acceptsymbol->content->number = nnterms++; /* Construct the YYerror/"error" token */ errtoken = symbol_get ("YYerror", empty_loc); diff --git a/src/symtab.h b/src/symtab.h index af6de8af..7bfd310c 100644 --- a/src/symtab.h +++ b/src/symtab.h @@ -245,7 +245,7 @@ extern symbol *eoftoken; /** The genuine start symbol. $accept: start-symbol $end */ -extern symbol *accept; +extern symbol *acceptsymbol; /** The user start symbol. */ extern symbol *startsymbol; |