Regen.

[bison.git] / src / gram.h

diff --git a/src/gram.h b/src/gram.h
index 024501e3f07da7c41e7f01c5f2cdfd79ea8f5b85..f143b4ee50e6872c85ef8156d8a572a1900568fa 100644 (file)
--- a/src/gram.h
+++ b/src/gram.h
@@ -54,23 +54,24 @@
 
    RULES is an array of struct rule_s, which members are:
 
 
    RULES is an array of struct rule_s, which members are:
 

-   RULES[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.
+   RULES[R].lhs -- the symbol of the left hand side of rule R.

 
    RULES[R].rhs -- the index in RITEM of the beginning of the portion
    for rule R.
 
 
    RULES[R].rhs -- the index in RITEM of the beginning of the portion
    for rule R.
 

-   RULES[R].prec -- the precedence level of R.
+   RULES[R].prec -- the symbol providing the precedence level of R.

 
 

-   RULES[R].precsym -- the symbol-number of the symbol in %prec for R
-   (if any).
+   RULES[R].precsym -- the symbol attached (via %prec) to give its
+   precedence to R.  Of course, if set, it is equal to `prec', but we
+   need to distinguish one from the other when reducing: a symbol used
+   in a %prec is not useless.

 
    RULES[R].assoc -- the associativity of R.
 
    RULES[R].line -- the line where R was defined.
 
 
    RULES[R].assoc -- the associativity of R.
 
    RULES[R].line -- the line where R was defined.
 

-   RULES[R].useful -- TRUE iff the rule is used.
+   RULES[R].useful -- TRUE iff the rule is used (i.e., FALSE if thrown
+   away by reduce).

 
    The right hand side is stored as symbol numbers in a portion of
    RITEM.
 
    The right hand side is stored as symbol numbers in a portion of
    RITEM.


@@ -81,7 +82,7 @@
    says which rule it is for.
 
    The portions of RITEM come in order of increasing rule number 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.  nitems
+   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.
    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.


@@ -103,16 +104,27 @@
 #define        ISTOKEN(s)      ((s) < ntokens)
 #define        ISVAR(s)        ((s) >= ntokens)
 
 #define        ISTOKEN(s)      ((s) < ntokens)
 #define        ISVAR(s)        ((s) >= ntokens)
 

-extern int nitems;

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

-extern short *ritem;
+#define ITEM_NUMBER_MAX INT_MAX
+typedef int item_number_t;
+extern item_number_t *ritem;

 extern int nritems;
 
 extern int nritems;
 

-extern int start_symbol;
+/* There is weird relationship between item_number_t and
+   token_number_t: we store token_number_t in item_number_t, but in
+   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
+   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))
+
+extern token_number_t start_symbol;
+

 
 typedef struct rule_s
 {
 
 typedef struct rule_s
 {


@@ -124,31 +136,34 @@ typedef struct rule_s
      except if some rules are useless.  */
   short number;
 
      except if some rules are useless.  */
   short number;
 

-  bucket *lhs;
-  short *rhs;
-  short prec;
-  short precsym;
-  associativity assoc;
-  short line;
+  symbol_t *lhs;
+  item_number_t *rhs;
+
+  /* This symbol provides both the associativity, and the precedence. */
+  symbol_t *prec;
+
+  /* This symbol was attached to the rule via %prec. */
+  symbol_t *precsym;
+
+  int line;

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

-  short action_line;
+  int action_line;

 
   const char *guard;
 
   const char *guard;

-  short guard_line;
+  int guard_line;

 } rule_t;
 
 extern struct rule_s *rules;
 
 /* Table of the symbols, indexed by the symbol number. */
 } rule_t;
 
 extern struct rule_s *rules;
 
 /* Table of the symbols, indexed by the symbol number. */

-extern struct bucket **symbols;
-
-/* 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.  */
+extern symbol_t **symbols;

 
 

-extern short *token_translations;
+/* 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 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


@@ -162,10 +177,6 @@ extern int semantic_parser;
 
 extern int pure_parser;
 
 
 extern int pure_parser;
 

-/* ERROR_TOKEN_NUMBER is the token number of the error token.  */
-
-extern int error_token_number;
-

 /* Report the length of the RHS. */
 int rule_rhs_length PARAMS ((rule_t *rule));
 
 /* Report the length of the RHS. */
 int rule_rhs_length PARAMS ((rule_t *rule));
 


@@ -175,4 +186,7 @@ void ritem_print PARAMS ((FILE *out));
 /* Return the size of the longest rule RHS.  */
 size_t ritem_longest_rhs PARAMS ((void));
 
 /* Return the size of the longest rule RHS.  */
 size_t ritem_longest_rhs PARAMS ((void));
 

+/* Dump the grammar. */
+void grammar_dump PARAMS ((FILE *out, const char *title));
+

 #endif /* !GRAM_H_ */
 #endif /* !GRAM_H_ */