X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/b2a0b7ca70f9490693d517d10c9c4a64c9fc1af0..0049ec8628e5a320d055a0cea8676a58cec60986:/src/symtab.h
diff --git a/src/symtab.h b/src/symtab.h
index 243d3d0c..7a25b360 100644
--- a/src/symtab.h
+++ b/src/symtab.h
@@ -1,6 +1,6 @@
/* Definitions for symtab.c and callers, part of Bison.
- Copyright (C) 1984, 1989, 1992, 2000, 2001, 2002, 2004, 2005, 2006
+ Copyright (C) 1984, 1989, 1992, 2000, 2001, 2002, 2004, 2005, 2006, 2007
Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
@@ -30,6 +30,7 @@
# include "assoc.h"
# include "location.h"
+# include "scan-code.h"
# include "uniqstr.h"
/*----------.
@@ -69,28 +70,16 @@ struct symbol
/** Any \c \%destructor declared specifically for this symbol.
Access this field only through symbol's interface functions. For
- example, if symbol::destructor = NULL, the default
- \c \%destructor or a per-type \c \%destructor might be appropriate, and
+ example, if symbol::destructor = NULL, 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;
-
- /** The location of \c symbol::destructor.
-
- Access this field only through symbol's interface functions.
- \sa symbol::destructor */
- location destructor_location;
+ code_props destructor;
/** Any \c \%printer declared specifically for this symbol.
Access this field only through symbol's interface functions.
\sa symbol::destructor */
- const char *printer;
-
- /** The location of \c symbol::printer.
-
- Access this field only through symbol's interface functions.
- \sa symbol::destructor */
- location printer_location;
+ code_props printer;
symbol_number number;
location prec_location;
@@ -144,26 +133,18 @@ void symbol_make_alias (symbol *sym, symbol *symval, location loc);
void symbol_type_set (symbol *sym, uniqstr type_name, location loc);
/** Set the \c destructor associated with \c sym. */
-void symbol_destructor_set (symbol *sym, const char *destructor, location loc);
-
-/** Get the computed \c \%destructor for \c sym, or \c NULL if none. */
-const char *symbol_destructor_get (symbol *sym);
+void symbol_destructor_set (symbol *sym, code_props const *destructor);
-/** Get the grammar location of the computed \c \%destructor for \c sym.
-
- \pre symbol_destructor_get (sym) != NULL */
-location symbol_destructor_location_get (symbol *sym);
+/** Get the computed \c \%destructor for \c sym, which was initialized with
+ \c code_props_none_init if there's no \c \%destructor. */
+code_props const *symbol_destructor_get (symbol const *sym);
/** Set the \c printer associated with \c sym. */
-void symbol_printer_set (symbol *sym, const char *printer, location loc);
-
-/** Get the computed \c \%printer for \c sym, or \c NULL if none. */
-const char *symbol_printer_get (symbol *sym);
+void symbol_printer_set (symbol *sym, code_props const *printer);
-/** Get the grammar location of the computed \c \%printer for \c sym.
-
- \pre symbol_printer_get (sym) != NULL */
-location symbol_printer_location_get (symbol *sym);
+/** Get the computed \c \%printer for \c sym, which was initialized with
+ \c code_props_none_init if there's no \c \%printer. */
+code_props const *symbol_printer_get (symbol const *sym);
/* Set the \c precedence associated with \c sym.
@@ -201,22 +182,17 @@ extern location startsymbol_location;
`-----------------*/
/** A semantic type and its associated \c \%destructor and \c \%printer.
-
+
Access the fields of this struct only through the interface functions in
this file. \sa symbol::destructor */
-typedef struct semantic_type {
+typedef struct {
/** The key, name of the semantic type. */
uniqstr tag;
/** Any \c %destructor declared for this semantic type. */
- const char *destructor;
- /** The location of \c semantic_type::destructor. */
- location destructor_location;
-
+ code_props destructor;
/** Any \c %printer declared for this semantic type. */
- const char *printer;
- /** The location of \c semantic_type::printer. */
- location printer_location;
+ code_props printer;
} semantic_type;
/** Fetch (or create) the semantic type associated to KEY. */
@@ -226,12 +202,12 @@ semantic_type *semantic_type_from_uniqstr (const uniqstr key);
semantic_type *semantic_type_get (const char *key);
/** Set the \c destructor associated with \c type. */
-void semantic_type_destructor_set (semantic_type *type, const char *destructor,
- location loc);
+void semantic_type_destructor_set (semantic_type *type,
+ code_props const *destructor);
/** Set the \c printer associated with \c type. */
-void semantic_type_printer_set (semantic_type *type, const char *printer,
- location loc);
+void semantic_type_printer_set (semantic_type *type,
+ code_props const *printer);
/*----------------------------------.
| Symbol and semantic type tables. |
@@ -255,14 +231,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 (code_props const *destructor);
+/** Set the default \c \%destructor for tagless values. */
+void default_tagless_destructor_set (code_props const *destructor);
-/** 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 (code_props const *printer);
+/** Set the default \c \%printer for tagless values. */
+void default_tagless_printer_set (code_props const *printer);
#endif /* !SYMTAB_H_ */