Merge remote-tracking branch 'origin/maint'

[bison.git] / src / symtab.h

diff --git a/src/symtab.h b/src/symtab.h
index 0ef4db29d17e87400af3c274b118b123c2993af3..84113394b5fcce7612b311036c2cfced7194a262 100644 (file)
--- a/src/symtab.h
+++ b/src/symtab.h
@@ -154,7 +154,10 @@ void symbol_print (symbol *s, FILE *f);
 /** Is this a dummy nonterminal?  */
 bool symbol_is_dummy (const symbol *sym);
 
-/** Return the name of the symbol that can be used as an identifier.
+/** The name of the code_props type: "\%destructor" or "\%printer".  */
+char const *code_props_type_string (code_props_type kind);
+
+/** The name of the symbol that can be used as an identifier.
  ** Consider the alias if needed.
  ** Return 0 if there is none (e.g., the symbol is only defined as
  ** a string). */
@@ -229,6 +232,13 @@ typedef struct {
   /** The key, name of the semantic type.  */
   uniqstr tag;
 
+  /** The location of its first occurence.  */
+  location location;
+
+  /** Its status : "undeclared", "used" or "declared".
+      It cannot be "needed".  */
+  status status;
+
   /** Any \c %destructor and %printer declared for this
       semantic type.  */
   code_props props[CODE_PROPS_SIZE];
@@ -236,10 +246,11 @@ typedef struct {
 } semantic_type;
 
 /** Fetch (or create) the semantic type associated to KEY.  */
-semantic_type *semantic_type_from_uniqstr (const uniqstr key);
+semantic_type *semantic_type_from_uniqstr (const uniqstr key,
+                                           const location *loc);
 
 /** Fetch (or create) the semantic type associated to KEY.  */
-semantic_type *semantic_type_get (const char *key);
+semantic_type *semantic_type_get (const char *key, const location *loc);
 
 /** Set the \c destructor or \c printer associated with \c type.  */
 void semantic_type_code_props_set (semantic_type *type,