mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-19 17:23:02 +00:00
Merge remote-tracking branch 'origin/maint'
* origin/maint: (29 commits) regen synclines: remove spurious empty line also support $<foo>$ in the %initial-action skeletons: b4_dollar_pushdef and popdef to simpify complex definitions regen printer/destructor: translate only once factor the handling of m4 escaping news: schedule the removal of the ";" hack style changes in the scanners regen support $<tag>$ in printers and destructors scan-code: factor the handling of the type in $<TYPE>$ muscles: fix another occurrence of unescaped type name glr.cc: fix the handling of yydebug gnulib: update formatting changes tests: fix an assertion tests: adjust to GCC 4.8, which displays caret errors be sure to properly escape type names obstack_quote: escape and quote for M4 muscles: shuffle responsabilities muscles: make private functions static muscles: rename private functions/macros obstack_escape: escape M4 characters remove dead macro maint: style changes doc: avoid problems with case insensitive file systems configure: fix botched quoting news: fix typo. Conflicts: NEWS data/c.m4 data/glr.cc data/lalr1.cc examples/rpcalc/local.mk src/muscle-tab.h src/output.c src/parse-gram.c src/parse-gram.h src/parse-gram.y src/scan-code.l src/symlist.c src/symlist.h src/symtab.h tests/calc.at
This commit is contained in:
@@ -191,15 +191,12 @@ symbol_list_null (symbol_list *node)
|
||||
|
||||
void
|
||||
symbol_list_code_props_set (symbol_list *node, code_props_type kind,
|
||||
location loc, char const *code)
|
||||
code_props const *cprops)
|
||||
{
|
||||
code_props cprops;
|
||||
code_props_symbol_action_init (&cprops, code, loc);
|
||||
code_props_translate_code (&cprops);
|
||||
switch (node->content_type)
|
||||
{
|
||||
case SYMLIST_SYMBOL:
|
||||
symbol_code_props_set (node->content.sym, kind, &cprops);
|
||||
symbol_code_props_set (node->content.sym, kind, cprops);
|
||||
if (node->content.sym->status == undeclared)
|
||||
node->content.sym->status = used;
|
||||
break;
|
||||
@@ -207,7 +204,7 @@ symbol_list_code_props_set (symbol_list *node, code_props_type kind,
|
||||
semantic_type_code_props_set
|
||||
(semantic_type_get (node->content.sem_type->tag,
|
||||
&node->content.sem_type->location),
|
||||
kind, &cprops);
|
||||
kind, cprops);
|
||||
if (node->content.sem_type->status == undeclared)
|
||||
node->content.sem_type->status = used;
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user