* src/bison.simple (union yyalloc): Change member names

[bison.git] / src / gram.h

diff --git a/src/gram.h b/src/gram.h
index e270db5c7c7c6ee0cd365a467152cdd6e825faaf..ca55d007b55ed79062969415f4b054469c0c673c 100644 (file)
--- a/src/gram.h
+++ b/src/gram.h
@@ -1,5 +1,5 @@
 /* Data definitions for internal representation of bison's input,
 /* Data definitions for internal representation of bison's input,

-   Copyright 1984, 1986, 1989, 1992 Free Software Foundation, Inc.
+   Copyright 1984, 1986, 1989, 1992, 2001  Free Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -38,21 +38,38 @@
    The rules receive rule numbers 1 to nrules in the order they are
    written.  Actions and guards are accessed via the rule number.
 
    The rules receive rule numbers 1 to nrules in the order they are
    written.  Actions and guards are accessed via the rule number.
 

-   The rules themselves are described by three arrays: rrhs, rlhs and
-   ritem.  rlhs[R] is the symbol number of the left hand side of rule
-   R.  The right hand side is stored as symbol numbers in a portion of
-   ritem.  rrhs[R] contains the index in ritem of the beginning of the
+   The rules themselves are described by several arrays: amongst which
+   RITEM, and RULE_TABLE.
+
+   RULE_TABLE is an array of struct rule_s, which members are:
+
+   RULE_TABLE[R].lhs -- the symbol number of the left hand side of
+   rule R.  If -1, the rule has been thrown out by reduce.c and should
+   be ignored.
+
+   RULE_TABLE[R].rhs -- the index in RITEM of the beginning of the

    portion for rule R.
 
    portion for rule R.
 

-   If rlhs[R] is -1, the rule has been thrown out by reduce.c and
-   should be ignored.
+   RULE_TABLE[R].prec -- the precedence level of R.
+
+   RULE_TABLE[R].precsym -- the symbol-number of the symbol in %prec
+   for R (if any).
+
+   RULE_TABLE[R].assoc -- the associativity of R.
+
+   RULE_TABLE[R].line -- the line where R was defined.
+
+   RULE_TABLE[R].useful -- TRUE iff the rule is used.
+
+   The right hand side is stored as symbol numbers in a portion of
+   RITEM.

 
    The length of the portion is one greater than the number of symbols
    in the rule's right hand side.  The last element in the portion
    contains minus R, which identifies it as the end of a portion and
    says which rule it is for.
 
 
    The length of the portion is one greater than the number of symbols
    in the rule's right hand side.  The last element in the portion
    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
+   The portions of RITEM come in order of increasing rule number and

    are followed by an element which is zero to mark the end.  nitems
    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
    are followed by an element which is zero to mark the end.  nitems
    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


@@ -61,10 +78,7 @@
    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.
 

-   Precedence levels are recorded in the vectors sprec and rprec.
-   sprec records the precedence level of each symbol, rprec the
-   precedence level of each rule.  rprecsym is the symbol-number of
-   the symbol in %prec for this rule (if any).
+   SPREC records the precedence level of each symbol.

 
    Precedence levels are assigned in increasing order starting with 1
    so that numerically higher precedence values mean tighter binding
 
    Precedence levels are assigned in increasing order starting with 1
    so that numerically higher precedence values mean tighter binding


@@ -84,18 +98,12 @@ extern int ntokens;
 extern int nvars;
 
 extern short *ritem;
 extern int nvars;
 
 extern short *ritem;

-extern short *rlhs;
-extern short *rrhs;
-extern short *rprec;
-extern short *rprecsym;
+

 extern short *sprec;
 extern short *sprec;

-extern short *rassoc;

 extern short *sassoc;
 extern short *sassoc;

-extern short *rline;           /* Source line number of each rule */

 
 extern int start_symbol;
 
 
 extern int start_symbol;
 

-

 /* associativity values in elements of rassoc, sassoc.  */
 typedef enum
 {
 /* associativity values in elements of rassoc, sassoc.  */
 typedef enum
 {


@@ -105,15 +113,24 @@ typedef enum
 } associativity;
 
 
 } associativity;
 
 

+typedef struct rule_s
+{
+  short lhs;
+  short rhs;
+  short prec;
+  short precsym;
+  short assoc;
+  short line;
+  bool useful;
+} rule_t;
+
+extern struct rule_s *rule_table;
+

 /* token translation table: indexed by a token number as returned by
    the user's yylex routine, it yields the internal token number used
 /* token translation 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.  If translations is zero, the
-   translation table is not used because the two kinds of token
-   numbers are the same.  (It is noted in reader.c that "Nowadays
-   translations is always set to 1...") */
+   by the parser and throughout bison.  */

 
 extern short *token_translations;
 
 extern short *token_translations;

-extern int translations;

 extern int max_user_token_number;
 
 /* SEMANTIC_PARSER is nonzero if the input file says to use the hairy
 extern int max_user_token_number;
 
 /* SEMANTIC_PARSER is nonzero if the input file says to use the hairy