Let symbols have a location.

[bison.git] / src / gram.h

diff --git a/src/gram.h b/src/gram.h
index af4e636cac758950f83e80c1cad1a7d0007a0199..ff43ab8f4063c7d02c5d2e0e1933c9001c6219b2 100644 (file)
--- a/src/gram.h
+++ b/src/gram.h
@@ -81,11 +81,9 @@
    contains minus R, which identifies it as the end of a portion and
    says which rule it is for.
 
    contains minus R, which identifies it as the end of a portion and
    says which rule it is for.
 

-   The portions of RITEM come in order of increasing rule number and
-   are followed by an element which is zero to mark the end.  nritems
-   is the total length of ritem, not counting the final zero.  Each
-   element of RITEM is called an "item" and its index in RITEM is an
-   item number.
+   The portions of RITEM come in order of increasing rule number.
+   NRITEMS is the total length of RITEM.  Each element of RITEM is
+   called an "item" and its index in RITEM is an item number.

 
    Item numbers are used in the finite state machine to represent
    places that parsing can get to.
 
    Item numbers are used in the finite state machine to represent
    places that parsing can get to.


@@ -99,31 +97,32 @@
 
    Associativities are recorded similarly in SYMBOLS[I]->assoc.  */
 
 
    Associativities are recorded similarly in SYMBOLS[I]->assoc.  */
 

-#include "symtab.h"
+# include "location.h"
+# include "symtab.h"

 
 

-#define        ISTOKEN(s)      ((s) < ntokens)
-#define        ISVAR(s)        ((s) >= ntokens)
+# define ISTOKEN(s)    ((s) < ntokens)
+# define ISVAR(s)      ((s) >= ntokens)

 
 extern int nrules;
 extern int nsyms;
 extern int ntokens;
 extern int nvars;
 
 
 extern int nrules;
 extern int nsyms;
 extern int ntokens;
 extern int nvars;
 

-#define ITEM_NUMBER_MAX INT_MAX
+# define ITEM_NUMBER_MAX INT_MAX

 typedef int item_number_t;
 extern item_number_t *ritem;
 typedef int item_number_t;
 extern item_number_t *ritem;

-extern int nritems;
+extern unsigned int nritems;

 
 /* There is weird relationship between item_number_t and
 
 /* There is weird relationship between item_number_t and

-   token_number_t: we store token_number_t in item_number_t, but in
+   symbol_number_t: we store symbol_number_t in item_number_t, but in

    the latter we also store, as negative numbers, the rule numbers.
 
    the latter we also store, as negative numbers, the rule numbers.
 

-   Therefore, an token_number_t must be a valid item_number_t, and we
+   Therefore, an symbol_number_t must be a valid item_number_t, and we

    sometimes have to perform the converse transformation.  */
    sometimes have to perform the converse transformation.  */

-#define token_number_as_item_number(Tok) ((item_number_t) (Tok))
-#define item_number_as_token_number(Ite) ((token_number_t) (Ite))
+# define symbol_number_as_item_number(Tok) ((item_number_t) (Tok))
+# define item_number_as_symbol_number(Ite) ((symbol_number_t) (Ite))

 
 

-extern token_number_t start_symbol;
+extern symbol_number_t start_symbol;

 
 
 typedef struct rule_s
 
 
 typedef struct rule_s


@@ -145,11 +144,11 @@ typedef struct rule_s
   /* This symbol was attached to the rule via %prec. */
   symbol_t *precsym;
 
   /* This symbol was attached to the rule via %prec. */
   symbol_t *precsym;
 

-  int line;
+  location_t location;

   bool useful;
 
   const char *action;
   bool useful;
 
   const char *action;

-  int action_line;
+  location_t action_location;

 } rule_t;
 
 extern struct rule_s *rules;
 } rule_t;
 
 extern struct rule_s *rules;


@@ -160,7 +159,7 @@ extern symbol_t **symbols;
 /* TOKEN_TRANSLATION -- a table indexed by a token number as returned
    by the user's yylex routine, it yields the internal token number
    used by the parser and throughout bison.  */
 /* TOKEN_TRANSLATION -- a table indexed by a token number as returned
    by the user's yylex routine, it yields the internal token number
    used by the parser and throughout bison.  */

-extern token_number_t *token_translations;
+extern symbol_number_t *token_translations;

 extern int max_user_token_number;
 
 
 extern int max_user_token_number;