X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/5458913abab5e33938892b0d279f02f3b09d94db..fd003416d59cae9645d164b12495eb186efee848:/src/symtab.h
diff --git a/src/symtab.h b/src/symtab.h
index 84113394..f585fd7b 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-2002, 2004-2012 Free Software
+ Copyright (C) 1984, 1989, 1992, 2000-2002, 2004-2013 Free Software
Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
@@ -46,7 +46,7 @@ typedef enum
/** Internal token numbers. */
typedef int symbol_number;
-#define SYMBOL_NUMBER_MAXIMUM INT_MAX
+# define SYMBOL_NUMBER_MAXIMUM INT_MAX
typedef struct symbol symbol;
@@ -54,13 +54,12 @@ typedef struct symbol symbol;
/* Declaration status of a symbol.
First, it is "undeclared". Then, if "undeclared" and used in a
- %printer/%destructor, it is "used". If not "declared" by used in a
- rule, it is "needed". Finally, if declared (via a rule for
- nonterminals, or %oken), it is "declared".
+ %printer/%destructor, it is "used". If not "declared" but used in
+ a rule, it is "needed". Finally, if declared (via a rule for
+ nonterminals, or %token), it is "declared".
When status are checked at the end, "declared" symbols are fine,
- "used" symbols trigger warnings, otherwise it's an error.
-*/
+ "used" symbols trigger warnings, otherwise it's an error. */
typedef enum
{
@@ -92,8 +91,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 +106,9 @@ struct symbol
symbol.
Access this field only through symbol's interface functions. For
- Example, if symbol::destructor = NULL (resp. symbol::printer
+ example, if symbol::destructor = NULL (resp. symbol::printer
= NULL), 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;
@@ -121,16 +126,16 @@ struct symbol
};
/** Undefined user number. */
-#define USER_NUMBER_UNDEFINED -1
+# define USER_NUMBER_UNDEFINED -1
/* `symbol->user_token_number == USER_NUMBER_HAS_STRING_ALIAS' means
this symbol has a literal string alias. For instance, `%token foo
"foo"' has `"foo"' numbered regularly, and `foo' numbered as
USER_NUMBER_HAS_STRING_ALIAS. */
-#define USER_NUMBER_HAS_STRING_ALIAS -9991
+# define USER_NUMBER_HAS_STRING_ALIAS -9991
/* Undefined internal token number. */
-#define NUMBER_UNDEFINED (-1)
+# define NUMBER_UNDEFINED (-1)
/** Fetch (or create) the symbol associated to KEY. */
symbol *symbol_from_uniqstr (const uniqstr key, location loc);
@@ -149,7 +154,7 @@ symbol *dummy_symbol_get (location loc);
`--------------------*/
/** Print a symbol (for debugging). */
-void symbol_print (symbol *s, FILE *f);
+void symbol_print (symbol const *s, FILE *f);
/** Is this a dummy nonterminal? */
bool symbol_is_dummy (const symbol *sym);
@@ -179,15 +184,14 @@ void symbol_code_props_set (symbol *sym, code_props_type kind,
code_props const *destructor);
/** Get the computed \c \%destructor or \c %printer for \c sym, which was
-initialized with \c code_props_none_init if there's no \c \%destructor or
-\c %printer. */
-code_props const *symbol_code_props_get (symbol const *sym,
- code_props_type kind);
+ initialized with \c code_props_none_init if there's no \c \%destructor or
+ \c %printer. */
+code_props *symbol_code_props_get (symbol *sym, code_props_type kind);
-/* Set the \c precedence associated with \c sym.
+/** Set the \c precedence associated with \c sym.
- Ensure that \a symbol is a terminal.
- Do nothing if invoked with \c undef_assoc as \c assoc. */
+ Ensure that \a symbol is a terminal.
+ Do nothing if invoked with \c undef_assoc as \c assoc. */
void symbol_precedence_set (symbol *sym, int prec, assoc a, location loc);
/** Set the \c class associated with \c sym. */
@@ -220,6 +224,59 @@ extern symbol *startsymbol;
extern location startsymbol_location;
+
+/*-------------------.
+| Symbol Relations. |
+`-------------------*/
+
+/* The symbol relations are represented by a directed graph. */
+
+/* The id of a node */
+typedef int graphid;
+
+typedef struct symgraphlink symgraphlink;
+
+struct symgraphlink
+{
+ /** The second \c symbol or group of a precedence relation.
+ * See \c symgraph. */
+ graphid id;
+
+ symgraphlink *next;
+};
+
+/* Symbol precedence graph, to store the used precedence relations between
+ * symbols. */
+
+typedef struct symgraph symgraph;
+
+struct symgraph
+{
+ /** Identifier for the node: equal to the number of the symbol. */
+ graphid id;
+
+ /** The list of related symbols that have a smaller precedence. */
+ symgraphlink *succ;
+
+ /** The list of related symbols that have a greater precedence. */
+ symgraphlink *pred;
+};
+
+/** Register a new precedence relation as used. */
+
+void register_precedence (graphid first, graphid snd);
+
+/** Print a warning for each symbol whose precedence and/or associativity
+ * is useless. */
+
+void print_precedence_warnings (void);
+
+/*----------------------.
+| Symbol associativity |
+`----------------------*/
+
+void register_assoc (graphid i, graphid j);
+
/*-----------------.
| Semantic types. |
`-----------------*/
@@ -278,16 +335,4 @@ void symbols_check_defined (void);
#token_translations. */
void symbols_pack (void);
-
-/*---------------------------------------.
-| Default %destructor's and %printer's. |
-`---------------------------------------*/
-
-/** Set the default \c \%destructor or \c \%printer for tagged values. */
-void default_tagged_code_props_set (code_props_type kind,
- code_props const *code);
-/** Set the default \c \%destructor or \c \%printer for tagless values. */
-void default_tagless_code_props_set (code_props_type kind,
- code_props const *destructor);
-
#endif /* !SYMTAB_H_ */