mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-18 16:53: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:
12
src/symtab.h
12
src/symtab.h
@@ -92,8 +92,14 @@ struct symbol
|
||||
/** The location of its first occurrence. */
|
||||
location location;
|
||||
|
||||
/** Its \c \%type. */
|
||||
/** Its \c \%type.
|
||||
|
||||
Beware that this is the type_name as was entered by the user,
|
||||
including silly things such as "]" if she entered "%token <]> t".
|
||||
Therefore, when outputting type_name to M4, be sure to escape it
|
||||
into "@}". See quoted_output for instance. */
|
||||
uniqstr type_name;
|
||||
|
||||
/** Its \c \%type's location. */
|
||||
location type_location;
|
||||
|
||||
@@ -101,9 +107,9 @@ struct symbol
|
||||
symbol.
|
||||
|
||||
Access this field only through <tt>symbol</tt>'s interface functions. For
|
||||
Example, if <tt>symbol::destructor = NULL</tt> (resp. <tt>symbol::printer
|
||||
example, if <tt>symbol::destructor = NULL</tt> (resp. <tt>symbol::printer
|
||||
= NULL</tt>), a default \c \%destructor (resp. \%printer) or a per-type
|
||||
\c symbol_destructor_printer_get will compute the corect one. */
|
||||
\c symbol_destructor_printer_get will compute the correct one. */
|
||||
code_props props[CODE_PROPS_SIZE];
|
||||
|
||||
symbol_number number;
|
||||
|
||||
Reference in New Issue
Block a user