mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-09 12:23:04 +00:00
Split the default %destructor/%printer into two kinds: <*> and <!>.
Discussed starting at <http://lists.gnu.org/archive/html/bison-patches/2006-09/msg00060.html>. * NEWS (2.3a+): Mention. * doc/bison.texinfo (Freeing Discarded Symbols): Document this and the previous change today related to mid-rules. (Bison Symbols): Remove %symbol-default and add <*> and <!>. * src/parser-gram.y (PERCENT_SYMBOL_DEFAULT): Remove. (TYPE_TAG_ANY): Add as <*>. (TYPE_TAG_NONE): Add as <!>. (generic_symlist_item): Remove RHS for %symbol-default and add RHS's for <*> and <!>. * src/scan-gram.l (PERCENT_SYMBOL_DEFAULT): Remove. (TYPE_TAG_ANY, TYPE_TAG_NONE): Add. * src/symlist.c (symbol_list_default_new): Split into tagged and tagless versions. (symbol_list_destructor_set, symbol_list_printer_set): Split SYMLIST_DEFAULT case into SYMLIST_DEFAULT_TAGGED and SYMLIST_DEFAULT_TAGLESS. * src/symlist.h: Update symbol_list_default*_new prototypes. (symbol_list.content_type): Split enum value SYMLIST_DEFAULT into SYMLIST_DEFAULT_TAGGED and SYMLIST_DEFAULT_TAGLESS. * src/symtab.c (default_destructor, default_destructor_location, default_printer, default_printer_location): Split each into tagged and tagless versions. (symbol_destructor_get, symbol_destructor_location_get, symbol_printer_get, symbol_printer_location_get): Implement tagged default and tagless default cases. (default_destructor_set, default_printer_set): Split each into tagged and tagless versions. * src/symtab.h: Update prototypes. * tests/actions.at (Default %printer and %destructor): Rename to... (Default tagless %printer and %destructor): ... this, and extend. (Per-type %printer and %destructor): Rename to... (Default tagged and per-type %printer and %destructor): ... this, and extend. (Default %printer and %destructor for user-defined end token): Extend. (Default %printer and %destructor are not for error or $undefined): Update. (Default %printer and %destructor are not for $accept): Update. (Default %printer and %destructor for mid-rule values): Extend. * tests/input.at (Default %printer and %destructor redeclared): Extend. (Unused values with default %destructor): Extend.
This commit is contained in:
Joel E. Denny
200
src/parse-gram.h
200
src/parse-gram.h
@@ -48,55 +48,56 @@
|
||||
PERCENT_TYPE = 262,
|
||||
PERCENT_DESTRUCTOR = 263,
|
||||
PERCENT_PRINTER = 264,
|
||||
PERCENT_SYMBOL_DEFAULT = 265,
|
||||
PERCENT_LEFT = 266,
|
||||
PERCENT_RIGHT = 267,
|
||||
PERCENT_NONASSOC = 268,
|
||||
PERCENT_PREC = 269,
|
||||
PERCENT_DPREC = 270,
|
||||
PERCENT_MERGE = 271,
|
||||
PERCENT_CODE = 272,
|
||||
PERCENT_CODE_TOP = 273,
|
||||
PERCENT_DEBUG = 274,
|
||||
PERCENT_DEFAULT_PREC = 275,
|
||||
PERCENT_DEFINE = 276,
|
||||
PERCENT_DEFINES = 277,
|
||||
PERCENT_ERROR_VERBOSE = 278,
|
||||
PERCENT_EXPECT = 279,
|
||||
PERCENT_EXPECT_RR = 280,
|
||||
PERCENT_FILE_PREFIX = 281,
|
||||
PERCENT_GLR_PARSER = 282,
|
||||
PERCENT_INITIAL_ACTION = 283,
|
||||
PERCENT_LEX_PARAM = 284,
|
||||
PERCENT_LOCATIONS = 285,
|
||||
PERCENT_NAME_PREFIX = 286,
|
||||
PERCENT_NO_DEFAULT_PREC = 287,
|
||||
PERCENT_NO_LINES = 288,
|
||||
PERCENT_NONDETERMINISTIC_PARSER = 289,
|
||||
PERCENT_OUTPUT = 290,
|
||||
PERCENT_PARSE_PARAM = 291,
|
||||
PERCENT_PROVIDES = 292,
|
||||
PERCENT_PURE_PARSER = 293,
|
||||
PERCENT_PUSH_PARSER = 294,
|
||||
PERCENT_REQUIRE = 295,
|
||||
PERCENT_REQUIRES = 296,
|
||||
PERCENT_SKELETON = 297,
|
||||
PERCENT_START = 298,
|
||||
PERCENT_TOKEN_TABLE = 299,
|
||||
PERCENT_VERBOSE = 300,
|
||||
PERCENT_YACC = 301,
|
||||
BRACED_CODE = 302,
|
||||
CHAR = 303,
|
||||
EPILOGUE = 304,
|
||||
EQUAL = 305,
|
||||
ID = 306,
|
||||
ID_COLON = 307,
|
||||
PERCENT_PERCENT = 308,
|
||||
PIPE = 309,
|
||||
PROLOGUE = 310,
|
||||
SEMICOLON = 311,
|
||||
TYPE = 312,
|
||||
PERCENT_UNION = 313
|
||||
PERCENT_LEFT = 265,
|
||||
PERCENT_RIGHT = 266,
|
||||
PERCENT_NONASSOC = 267,
|
||||
PERCENT_PREC = 268,
|
||||
PERCENT_DPREC = 269,
|
||||
PERCENT_MERGE = 270,
|
||||
PERCENT_CODE = 271,
|
||||
PERCENT_CODE_TOP = 272,
|
||||
PERCENT_DEBUG = 273,
|
||||
PERCENT_DEFAULT_PREC = 274,
|
||||
PERCENT_DEFINE = 275,
|
||||
PERCENT_DEFINES = 276,
|
||||
PERCENT_ERROR_VERBOSE = 277,
|
||||
PERCENT_EXPECT = 278,
|
||||
PERCENT_EXPECT_RR = 279,
|
||||
PERCENT_FILE_PREFIX = 280,
|
||||
PERCENT_GLR_PARSER = 281,
|
||||
PERCENT_INITIAL_ACTION = 282,
|
||||
PERCENT_LEX_PARAM = 283,
|
||||
PERCENT_LOCATIONS = 284,
|
||||
PERCENT_NAME_PREFIX = 285,
|
||||
PERCENT_NO_DEFAULT_PREC = 286,
|
||||
PERCENT_NO_LINES = 287,
|
||||
PERCENT_NONDETERMINISTIC_PARSER = 288,
|
||||
PERCENT_OUTPUT = 289,
|
||||
PERCENT_PARSE_PARAM = 290,
|
||||
PERCENT_PROVIDES = 291,
|
||||
PERCENT_PURE_PARSER = 292,
|
||||
PERCENT_PUSH_PARSER = 293,
|
||||
PERCENT_REQUIRE = 294,
|
||||
PERCENT_REQUIRES = 295,
|
||||
PERCENT_SKELETON = 296,
|
||||
PERCENT_START = 297,
|
||||
PERCENT_TOKEN_TABLE = 298,
|
||||
PERCENT_VERBOSE = 299,
|
||||
PERCENT_YACC = 300,
|
||||
BRACED_CODE = 301,
|
||||
CHAR = 302,
|
||||
EPILOGUE = 303,
|
||||
EQUAL = 304,
|
||||
ID = 305,
|
||||
ID_COLON = 306,
|
||||
PERCENT_PERCENT = 307,
|
||||
PIPE = 308,
|
||||
PROLOGUE = 309,
|
||||
SEMICOLON = 310,
|
||||
TYPE = 311,
|
||||
TYPE_TAG_ANY = 312,
|
||||
TYPE_TAG_NONE = 313,
|
||||
PERCENT_UNION = 314
|
||||
};
|
||||
#endif
|
||||
/* Tokens. */
|
||||
@@ -108,55 +109,56 @@
|
||||
#define PERCENT_TYPE 262
|
||||
#define PERCENT_DESTRUCTOR 263
|
||||
#define PERCENT_PRINTER 264
|
||||
#define PERCENT_SYMBOL_DEFAULT 265
|
||||
#define PERCENT_LEFT 266
|
||||
#define PERCENT_RIGHT 267
|
||||
#define PERCENT_NONASSOC 268
|
||||
#define PERCENT_PREC 269
|
||||
#define PERCENT_DPREC 270
|
||||
#define PERCENT_MERGE 271
|
||||
#define PERCENT_CODE 272
|
||||
#define PERCENT_CODE_TOP 273
|
||||
#define PERCENT_DEBUG 274
|
||||
#define PERCENT_DEFAULT_PREC 275
|
||||
#define PERCENT_DEFINE 276
|
||||
#define PERCENT_DEFINES 277
|
||||
#define PERCENT_ERROR_VERBOSE 278
|
||||
#define PERCENT_EXPECT 279
|
||||
#define PERCENT_EXPECT_RR 280
|
||||
#define PERCENT_FILE_PREFIX 281
|
||||
#define PERCENT_GLR_PARSER 282
|
||||
#define PERCENT_INITIAL_ACTION 283
|
||||
#define PERCENT_LEX_PARAM 284
|
||||
#define PERCENT_LOCATIONS 285
|
||||
#define PERCENT_NAME_PREFIX 286
|
||||
#define PERCENT_NO_DEFAULT_PREC 287
|
||||
#define PERCENT_NO_LINES 288
|
||||
#define PERCENT_NONDETERMINISTIC_PARSER 289
|
||||
#define PERCENT_OUTPUT 290
|
||||
#define PERCENT_PARSE_PARAM 291
|
||||
#define PERCENT_PROVIDES 292
|
||||
#define PERCENT_PURE_PARSER 293
|
||||
#define PERCENT_PUSH_PARSER 294
|
||||
#define PERCENT_REQUIRE 295
|
||||
#define PERCENT_REQUIRES 296
|
||||
#define PERCENT_SKELETON 297
|
||||
#define PERCENT_START 298
|
||||
#define PERCENT_TOKEN_TABLE 299
|
||||
#define PERCENT_VERBOSE 300
|
||||
#define PERCENT_YACC 301
|
||||
#define BRACED_CODE 302
|
||||
#define CHAR 303
|
||||
#define EPILOGUE 304
|
||||
#define EQUAL 305
|
||||
#define ID 306
|
||||
#define ID_COLON 307
|
||||
#define PERCENT_PERCENT 308
|
||||
#define PIPE 309
|
||||
#define PROLOGUE 310
|
||||
#define SEMICOLON 311
|
||||
#define TYPE 312
|
||||
#define PERCENT_UNION 313
|
||||
#define PERCENT_LEFT 265
|
||||
#define PERCENT_RIGHT 266
|
||||
#define PERCENT_NONASSOC 267
|
||||
#define PERCENT_PREC 268
|
||||
#define PERCENT_DPREC 269
|
||||
#define PERCENT_MERGE 270
|
||||
#define PERCENT_CODE 271
|
||||
#define PERCENT_CODE_TOP 272
|
||||
#define PERCENT_DEBUG 273
|
||||
#define PERCENT_DEFAULT_PREC 274
|
||||
#define PERCENT_DEFINE 275
|
||||
#define PERCENT_DEFINES 276
|
||||
#define PERCENT_ERROR_VERBOSE 277
|
||||
#define PERCENT_EXPECT 278
|
||||
#define PERCENT_EXPECT_RR 279
|
||||
#define PERCENT_FILE_PREFIX 280
|
||||
#define PERCENT_GLR_PARSER 281
|
||||
#define PERCENT_INITIAL_ACTION 282
|
||||
#define PERCENT_LEX_PARAM 283
|
||||
#define PERCENT_LOCATIONS 284
|
||||
#define PERCENT_NAME_PREFIX 285
|
||||
#define PERCENT_NO_DEFAULT_PREC 286
|
||||
#define PERCENT_NO_LINES 287
|
||||
#define PERCENT_NONDETERMINISTIC_PARSER 288
|
||||
#define PERCENT_OUTPUT 289
|
||||
#define PERCENT_PARSE_PARAM 290
|
||||
#define PERCENT_PROVIDES 291
|
||||
#define PERCENT_PURE_PARSER 292
|
||||
#define PERCENT_PUSH_PARSER 293
|
||||
#define PERCENT_REQUIRE 294
|
||||
#define PERCENT_REQUIRES 295
|
||||
#define PERCENT_SKELETON 296
|
||||
#define PERCENT_START 297
|
||||
#define PERCENT_TOKEN_TABLE 298
|
||||
#define PERCENT_VERBOSE 299
|
||||
#define PERCENT_YACC 300
|
||||
#define BRACED_CODE 301
|
||||
#define CHAR 302
|
||||
#define EPILOGUE 303
|
||||
#define EQUAL 304
|
||||
#define ID 305
|
||||
#define ID_COLON 306
|
||||
#define PERCENT_PERCENT 307
|
||||
#define PIPE 308
|
||||
#define PROLOGUE 309
|
||||
#define SEMICOLON 310
|
||||
#define TYPE 311
|
||||
#define TYPE_TAG_ANY 312
|
||||
#define TYPE_TAG_NONE 313
|
||||
#define PERCENT_UNION 314
|
||||
|
||||
|
||||
|
||||
@@ -177,7 +179,7 @@ typedef union YYSTYPE
|
||||
}
|
||||
|
||||
/* Line 1535 of yacc.c */
|
||||
#line 181 "parse-gram.h"
|
||||
#line 183 "parse-gram.h"
|
||||
YYSTYPE;
|
||||
# define YYSTYPE_IS_TRIVIAL 1
|
||||
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
|
||||
|
||||
Reference in New Issue
Block a user