X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/366eea36d3a9aaccf80a78c2fcd8c3cd6b563e25..39f4191608f2bbfb5a140b9ff96ecd56f5b287bb:/src/symtab.h

diff --git a/src/symtab.h b/src/symtab.h
index f5aed396..8a926eeb 100644
--- a/src/symtab.h
+++ b/src/symtab.h
@@ -103,19 +103,23 @@ const char *symbol_tag_get_n PARAMS ((symbol_t *symbol, int n));
 void symbol_tag_print PARAMS ((symbol_t *symbol, FILE *out));
 
 /* Fetch (or create) the symbol associated to KEY.  */
-symbol_t *getsym PARAMS ((const char *key, location_t location));
+symbol_t *symbol_get PARAMS ((const char *key, location_t location));
+
+/* Generate a dummy nonterminal, whose name cannot conflict with the
+   user's names.  */
+symbol_t *dummy_symbol_get PARAMS ((location_t location));
 
 /* Declare the new SYMBOL.  Make it an alias of SYMVAL.  */
 void symbol_make_alias PARAMS ((symbol_t *symbol, symbol_t *symval));
 
 /* Set the TYPE_NAME associated to SYMBOL. Does nothing if passed 0 as
    TYPE_NAME.  */
-void symbol_type_set PARAMS ((symbol_t *symbol, location_t location,
-			      char *type_name));
+void symbol_type_set PARAMS ((symbol_t *symbol,
+			      char *type_name, location_t location));
 
 /* Set the DESTRUCTOR associated to SYMBOL.  */
-void symbol_destructor_set PARAMS ((symbol_t *symbol, location_t location,
-				    char *destructor));
+void symbol_destructor_set PARAMS ((symbol_t *symbol,
+				    char *destructor, location_t location));
 
 /* Set the PRINTER associated to SYMBOL.  */
 void symbol_printer_set PARAMS ((symbol_t *symbol,
@@ -123,14 +127,18 @@ void symbol_printer_set PARAMS ((symbol_t *symbol,
 
 /* Set the PRECEDENCE associated to SYMBOL.  Ensures that SYMBOL is a
    terminal.  Does nothing if invoked with UNDEF_ASSOC as ASSOC.  */
-void symbol_precedence_set PARAMS ((symbol_t *symbol, location_t location,
-				    int prec, associativity assoc));
+void symbol_precedence_set PARAMS ((symbol_t *symbol,
+				    int prec, associativity assoc,
+				    location_t location));
 
 /* Set the CLASS associated to SYMBOL.  */
-void symbol_class_set PARAMS ((symbol_t *symbol, symbol_class class));
+void symbol_class_set PARAMS ((symbol_t *symbol,
+			       symbol_class class, location_t location));
 
 /* Set the USER_TOKEN_NUMBER associated to SYMBOL.  */
-void symbol_user_token_number_set PARAMS ((symbol_t *symbol, int user_number));
+void symbol_user_token_number_set PARAMS ((symbol_t *symbol,
+					   int user_number,
+					   location_t location));
 
 
 /* Distinguished symbols.  AXIOM is the real start symbol, that used