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

Split the default %destructor/%printer into two kinds: <*> and <!>.

Browse Source 
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
2006-10-21 10:03:35 +00:00
parent f91b162944
commit 12e3584054
13 changed files with 870 additions and 602 deletions
Download Patch File Download Diff File Expand all files Collapse all files

687
src/parse-gram.c
View File

File diff suppressed because it is too large Load Diff

200
src/parse-gram.h
View File

@@ -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 */

7
src/parse-gram.y
View File

@@ -116,8 +116,6 @@ static int current_prec = 0;
%token PERCENT_TYPE "%type"
%token PERCENT_DESTRUCTOR "%destructor"
%token PERCENT_PRINTER "%printer"
%token PERCENT_SYMBOL_DEFAULT
"%symbol-default"
%token PERCENT_LEFT "%left"
%token PERCENT_RIGHT "%right"
@@ -177,6 +175,8 @@ static int current_prec = 0;
%token PROLOGUE "%{...%}"
%token SEMICOLON ";"
%token TYPE "type"
%token TYPE_TAG_ANY "<*>"
%token TYPE_TAG_NONE "<!>"
%type <character> CHAR
%printer { fputs (char_name ($$), stderr); } CHAR
@@ -395,7 +395,8 @@ generic_symlist:
generic_symlist_item:
symbol { $$ = symbol_list_sym_new ($1, @1); }
| TYPE { $$ = symbol_list_type_new ($1, @1); }
| "%symbol-default" { $$ = symbol_list_default_new (@1); }
| "<*>" { $$ = symbol_list_default_tagged_new (@1); }
| "<!>" { $$ = symbol_list_default_tagless_new (@1); }
;
/* One token definition. */

3
src/scan-gram.l
View File

@@ -194,7 +194,6 @@ splice (\\[ \f\t\v]*\n)*
"%right" return PERCENT_RIGHT;
"%skeleton" return PERCENT_SKELETON;
"%start" return PERCENT_START;
"%symbol-default" return PERCENT_SYMBOL_DEFAULT;
"%term" return PERCENT_TOKEN;
"%token" return PERCENT_TOKEN;
"%token"[-_]"table" return PERCENT_TOKEN_TABLE;
@@ -210,6 +209,8 @@ splice (\\[ \f\t\v]*\n)*
"=" return EQUAL;
"|" return PIPE;
";" return SEMICOLON;
"<*>" return TYPE_TAG_ANY;
"<!>" return TYPE_TAG_NONE;
{id} {
val->uniqstr = uniqstr_new (yytext);

41
src/symlist.c
View File

@@ -74,16 +74,33 @@ symbol_list_type_new (uniqstr type_name, location loc)
}
/*----------------------------------------------------.
| Create a list containing a %symbol-default at LOC. |
`----------------------------------------------------*/
/*----------------------------------------.
| Create a list containing a <*> at LOC. |
`----------------------------------------*/
symbol_list *
symbol_list_default_new (location loc)
symbol_list_default_tagged_new (location loc)
{
symbol_list *res = xmalloc (sizeof *res);
res->content_type = SYMLIST_DEFAULT;
res->content_type = SYMLIST_DEFAULT_TAGGED;
res->location = loc;
res->next = NULL;
return res;
}
/*----------------------------------------.
| Create a list containing a <!> at LOC. |
`----------------------------------------*/
symbol_list *
symbol_list_default_tagless_new (location loc)
{
symbol_list *res = xmalloc (sizeof *res);
res->content_type = SYMLIST_DEFAULT_TAGLESS;
res->location = loc;
res->next = NULL;
@@ -215,8 +232,11 @@ symbol_list_destructor_set (symbol_list *node, const char *destructor,
semantic_type_destructor_set (
semantic_type_get (node->content.type_name), destructor, loc);
break;
case SYMLIST_DEFAULT:
default_destructor_set (destructor, loc);
case SYMLIST_DEFAULT_TAGGED:
default_tagged_destructor_set (destructor, loc);
break;
case SYMLIST_DEFAULT_TAGLESS:
default_tagless_destructor_set (destructor, loc);
break;
}
}
@@ -233,8 +253,11 @@ symbol_list_printer_set (symbol_list *node, const char *printer, location loc)
semantic_type_printer_set (
semantic_type_get (node->content.type_name), printer, loc);
break;
case SYMLIST_DEFAULT:
default_printer_set (printer, loc);
case SYMLIST_DEFAULT_TAGGED:
default_tagged_printer_set (printer, loc);
break;
case SYMLIST_DEFAULT_TAGLESS:
default_tagless_printer_set (printer, loc);
break;
}
}

15
src/symlist.h
View File

@@ -29,10 +29,13 @@
typedef struct symbol_list
{
/**
* Whether this node contains a symbol, a semantic type, or a
* \c \%symbol-default.
* Whether this node contains a symbol, a semantic type, a \c <*>, or a
* \c <!>.
*/
enum { SYMLIST_SYMBOL, SYMLIST_TYPE, SYMLIST_DEFAULT } content_type;
enum {
SYMLIST_SYMBOL, SYMLIST_TYPE,
SYMLIST_DEFAULT_TAGGED, SYMLIST_DEFAULT_TAGLESS
} content_type;
union {
/** The symbol or \c NULL iff <tt>node_type = SYMLIST_SYMBOL</tt>. */
symbol *sym;
@@ -76,8 +79,10 @@ symbol_list *symbol_list_sym_new (symbol *sym, location loc);
/** Create a list containing \c type_name at \c loc. */
symbol_list *symbol_list_type_new (uniqstr type_name, location loc);
/** Create a list containing a \c \%symbol-default at \c loc. */
symbol_list *symbol_list_default_new (location loc);
/** Create a list containing a \c <*> at \c loc. */
symbol_list *symbol_list_default_tagged_new (location loc);
/** Create a list containing a \c <!> at \c loc. */
symbol_list *symbol_list_default_tagless_new (location loc);
/** Print this list.

95
src/symtab.c
View File

@@ -41,14 +41,19 @@ symbol *accept = NULL;
symbol *startsymbol = NULL;
location startsymbol_location;
/*-----------------------------------.
| Default %destructor and %printer. |
`-----------------------------------*/
/*---------------------------------------.
| Default %destructor's and %printer's. |
`---------------------------------------*/
static const char *default_destructor = NULL;
static location default_destructor_location;
static const char *default_printer = NULL;
static location default_printer_location;
static const char *default_tagged_destructor = NULL;
static location default_tagged_destructor_location;
static const char *default_tagless_destructor = NULL;
static location default_tagless_destructor_location;
static const char *default_tagged_printer = NULL;
static location default_tagged_printer_location;
static const char *default_tagless_printer = NULL;
static location default_tagless_printer_location;
/*---------------------------------.
| Create a new symbol, named TAG. |
@@ -220,10 +225,13 @@ symbol_destructor_get (symbol *sym)
return type->destructor;
}
/* Apply the default %destructor only to user-defined symbols. */
/* Apply default %destructor's only to user-defined symbols. */
if (sym->tag[0] == '$' || sym == errtoken)
return NULL;
return default_destructor;
if (sym->type_name)
return default_tagged_destructor;
return default_tagless_destructor;
}
/*---------------------------------------------------------------.
@@ -240,8 +248,9 @@ symbol_destructor_location_get (symbol *sym)
semantic_type *type = semantic_type_get (sym->type_name);
if (type->destructor)
return type->destructor_location;
return default_tagged_destructor_location;
}
return default_destructor_location;
return default_tagless_destructor_location;
}
/*---------------------------------------------------------------.
@@ -300,7 +309,10 @@ symbol_printer_get (symbol *sym)
/* Apply the default %printer only to user-defined symbols. */
if (sym->tag[0] == '$' || sym == errtoken)
return NULL;
return default_printer;
if (sym->type_name)
return default_tagged_printer;
return default_tagless_printer;
}
/*------------------------------------------------------------.
@@ -317,8 +329,9 @@ symbol_printer_location_get (symbol *sym)
semantic_type *type = semantic_type_get (sym->type_name);
if (type->printer)
return type->printer_location;
return default_tagged_printer_location;
}
return default_printer_location;
return default_tagless_printer_location;
}
@@ -924,30 +937,58 @@ symbols_pack (void)
}
/*-----------------------------------.
| Set default %destructor/%printer. |
`-----------------------------------*/
/*--------------------------------------------------.
| Set default tagged/tagless %destructor/%printer. |
`--------------------------------------------------*/
void
default_destructor_set (const char *destructor, location loc)
default_tagged_destructor_set (const char *destructor, location loc)
{
if (default_destructor != NULL)
if (default_tagged_destructor != NULL)
{
complain_at (loc, _("redeclaration for default %%destructor"));
complain_at (default_destructor_location, _("previous declaration"));
complain_at (loc, _("redeclaration for default tagged %%destructor"));
complain_at (default_tagged_destructor_location,
_("previous declaration"));
}
default_destructor = destructor;
default_destructor_location = loc;
default_tagged_destructor = destructor;
default_tagged_destructor_location = loc;
}
void
default_printer_set (const char *printer, location loc)
default_tagless_destructor_set (const char *destructor, location loc)
{
if (default_printer != NULL)
if (default_tagless_destructor != NULL)
{
complain_at (loc, _("redeclaration for default %%printer"));
complain_at (default_printer_location, _("previous declaration"));
complain_at (loc, _("redeclaration for default tagless %%destructor"));
complain_at (default_tagless_destructor_location,
_("previous declaration"));
}
default_printer = printer;
default_printer_location = loc;
default_tagless_destructor = destructor;
default_tagless_destructor_location = loc;
}
void
default_tagged_printer_set (const char *printer, location loc)
{
if (default_tagged_printer != NULL)
{
complain_at (loc, _("redeclaration for default tagged %%printer"));
complain_at (default_tagged_printer_location,
_("previous declaration"));
}
default_tagged_printer = printer;
default_tagged_printer_location = loc;
}
void
default_tagless_printer_set (const char *printer, location loc)
{
if (default_tagless_printer != NULL)
{
complain_at (loc, _("redeclaration for default tagless %%printer"));
complain_at (default_tagless_printer_location,
_("previous declaration"));
}
default_tagless_printer = printer;
default_tagless_printer_location = loc;
}

22
src/symtab.h
View File

@@ -69,8 +69,8 @@ struct symbol
/** Any \c \%destructor declared specifically for this symbol.
Access this field only through <tt>symbol</tt>'s interface functions. For
example, if <tt>symbol::destructor = NULL</tt>, the default
\c \%destructor or a per-type \c \%destructor might be appropriate, and
example, if <tt>symbol::destructor = NULL</tt>, a default \c \%destructor
or a per-type \c \%destructor might be appropriate, and
\c symbol_destructor_get will compute the correct one. */
const char *destructor;
@@ -255,14 +255,18 @@ void symbols_check_defined (void);
void symbols_pack (void);
/*-----------------------------------.
| Default %destructor and %printer. |
`-----------------------------------*/
/*---------------------------------------.
| Default %destructor's and %printer's. |
`---------------------------------------*/
/** Set the default \c \%destructor. */
void default_destructor_set (const char *destructor, location loc);
/** Set the default \c \%destructor for tagged values. */
void default_tagged_destructor_set (const char *destructor, location loc);
/** Set the default \c \%destructor for tagless values. */
void default_tagless_destructor_set (const char *destructor, location loc);
/** Set the default \c \%printer. */
void default_printer_set (const char *printer, location loc);
/** Set the default \c \%printer for tagged values. */
void default_tagged_printer_set (const char *printer, location loc);
/** Set the default \c \%printer for tagless values. */
void default_tagless_printer_set (const char *printer, location loc);
#endif /* !SYMTAB_H_ */