(yylineno, yyoutname): Remove static vars, replacing

[bison.git] / src / symtab.h

diff --git a/src/symtab.h b/src/symtab.h
index 5fa705937dc04a4388599e70744e0eb2d61e72b8..61bd4017904b59ede7d50ca0401523281b075ee3 100644 (file)
--- a/src/symtab.h
+++ b/src/symtab.h
@@ -23,21 +23,12 @@
 # define SYMTAB_H_
 
 # include "location.h"
 # define SYMTAB_H_
 
 # include "location.h"

+# include "assoc.h"

 
 /*----------.
 | Symbols.  |
 `----------*/
 
 
 /*----------.
 | Symbols.  |
 `----------*/
 

-/* Associativity values for tokens and rules.  */
-typedef enum
-{
-  undef_assoc,
-  right_assoc,
-  left_assoc,
-  non_assoc
-} associativity;
-
-

 /* Symbol classes.  */
 typedef enum
 {
 /* Symbol classes.  */
 typedef enum
 {


@@ -49,6 +40,7 @@ typedef enum
 
 /* Internal token numbers. */
 typedef short symbol_number_t;
 
 /* Internal token numbers. */
 typedef short symbol_number_t;

+#define SYMBOL_NUMBER_MAX ((symbol_number_t) SHRT_MAX)

 
 
 typedef struct symbol_s symbol_t;
 
 
 typedef struct symbol_s symbol_t;


@@ -68,7 +60,7 @@ struct symbol_s
 
   symbol_number_t number;
   short prec;
 
   symbol_number_t number;
   short prec;

-  associativity assoc;
+  assoc_t assoc;

   int user_token_number;
 
   /* Points to the other in the identifier-symbol pair for an alias.
   int user_token_number;
 
   /* Points to the other in the identifier-symbol pair for an alias.


@@ -92,42 +84,41 @@ struct symbol_s
 
 
 /* Fetch (or create) the symbol associated to KEY.  */
 
 
 /* Fetch (or create) the symbol associated to KEY.  */

-symbol_t *symbol_get PARAMS ((const char *key, location_t location));
+symbol_t *symbol_get (const char *key, location_t location);

 
 /* Generate a dummy nonterminal, whose name cannot conflict with the
    user's names.  */
 
 /* Generate a dummy nonterminal, whose name cannot conflict with the
    user's names.  */

-symbol_t *dummy_symbol_get PARAMS ((location_t location));
+symbol_t *dummy_symbol_get (location_t location);

 
 /* Declare the new SYMBOL.  Make it an alias of SYMVAL.  */
 
 /* Declare the new SYMBOL.  Make it an alias of SYMVAL.  */

-void symbol_make_alias PARAMS ((symbol_t *symbol, symbol_t *symval));
+void symbol_make_alias (symbol_t *symbol, symbol_t *symval,
+                       location_t location);

 
 /* Set the TYPE_NAME associated to SYMBOL. Does nothing if passed 0 as
    TYPE_NAME.  */
 
 /* Set the TYPE_NAME associated to SYMBOL. Does nothing if passed 0 as
    TYPE_NAME.  */

-void symbol_type_set PARAMS ((symbol_t *symbol,
-                             char *type_name, location_t location));
+void symbol_type_set (symbol_t *symbol,
+                     char *type_name, location_t location);

 
 /* Set the DESTRUCTOR associated to SYMBOL.  */
 
 /* Set the DESTRUCTOR associated to SYMBOL.  */

-void symbol_destructor_set PARAMS ((symbol_t *symbol,
-                                   char *destructor, location_t location));
+void symbol_destructor_set (symbol_t *symbol,
+                           char *destructor, location_t location);

 
 /* Set the PRINTER associated to SYMBOL.  */
 
 /* Set the PRINTER associated to SYMBOL.  */

-void symbol_printer_set PARAMS ((symbol_t *symbol,
-                                char *printer, location_t location));
+void symbol_printer_set (symbol_t *symbol,
+                        char *printer, location_t location);

 
 /* Set the PRECEDENCE associated to SYMBOL.  Ensures that SYMBOL is a
    terminal.  Does nothing if invoked with UNDEF_ASSOC as ASSOC.  */
 
 /* 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,
-                                   int prec, associativity assoc,
-                                   location_t location));
+void symbol_precedence_set (symbol_t *symbol,
+                           int prec, assoc_t assoc, location_t location);

 
 /* Set the CLASS associated to SYMBOL.  */
 
 /* Set the CLASS associated to SYMBOL.  */

-void symbol_class_set PARAMS ((symbol_t *symbol,
-                              symbol_class class, location_t location));
+void symbol_class_set (symbol_t *symbol,
+                      symbol_class class, location_t location);

 
 /* Set the USER_TOKEN_NUMBER associated to SYMBOL.  */
 
 /* Set the USER_TOKEN_NUMBER associated to SYMBOL.  */

-void symbol_user_token_number_set PARAMS ((symbol_t *symbol,
-                                          int user_number,
-                                          location_t location));
+void symbol_user_token_number_set (symbol_t *symbol,
+                                  int user_number, location_t location);

 
 
 /* Distinguished symbols.  AXIOM is the real start symbol, that used
 
 
 /* Distinguished symbols.  AXIOM is the real start symbol, that used


@@ -135,8 +126,8 @@ void symbol_user_token_number_set PARAMS ((symbol_t *symbol,
    */
 extern symbol_t *errtoken;
 extern symbol_t *undeftoken;
    */
 extern symbol_t *errtoken;
 extern symbol_t *undeftoken;

-extern symbol_t *eoftoken;
-extern symbol_t *axiom;
+extern symbol_t *endtoken;
+extern symbol_t *accept;

 extern symbol_t *startsymbol;
 extern location_t startsymbol_location;
 
 extern symbol_t *startsymbol;
 extern location_t startsymbol_location;
 


@@ -147,24 +138,24 @@ extern location_t startsymbol_location;
 
 
 /* Create the symbol table.  */
 
 
 /* Create the symbol table.  */

-void symbols_new PARAMS ((void));
+void symbols_new (void);

 
 /* A function to apply to each symbol. */
 
 /* A function to apply to each symbol. */

-typedef bool (*symbol_processor) PARAMS ((symbol_t *));
+typedef bool (*symbol_processor) (symbol_t *);

 
 

-/* Apply PROCESSOR to all the symbols.  PROCESSOR must return TRUE: on
-   FALSE, the processing stops.  */
-void symbols_do PARAMS ((symbol_processor processor, void *processor_data));
+/* Apply PROCESSOR to all the symbols.  PROCESSOR must return true: on
+   false, the processing stops.  */
+void symbols_do (symbol_processor processor, void *processor_data);

 
 /* Free all the memory allocated for symbols.  */
 
 /* Free all the memory allocated for symbols.  */

-void symbols_free PARAMS ((void));
+void symbols_free (void);

 
 /* Check that all the symbols are defined.  Report any undefined
    symbols and consider them nonterminals.  */
 
 /* Check that all the symbols are defined.  Report any undefined
    symbols and consider them nonterminals.  */

-void symbols_check_defined PARAMS ((void));
+void symbols_check_defined (void);

 
 /* Perform various sanity checks, assign symbol numbers, and set up
    TOKEN_TRANSLATIONS.  */
 
 /* Perform various sanity checks, assign symbol numbers, and set up
    TOKEN_TRANSLATIONS.  */

-void symbols_pack PARAMS ((void));
+void symbols_pack (void);

 
 #endif /* !SYMTAB_H_ */
 
 #endif /* !SYMTAB_H_ */