* src/output.c (prepare_tokens): Go up to ntokens, not ntokens + 1.

[bison.git] / src / gram.h

diff --git a/src/gram.h b/src/gram.h
index b0f9daefcea4fcccd8d9348bbb544faaebfe28db..fc827ee47460d97ae8d4cc3a43e4a59e2e1ba000 100644 (file)
--- a/src/gram.h
+++ b/src/gram.h
@@ -68,6 +68,10 @@
 
    RULES[R].assoc -- the associativity of R.
 
+   RULES[R].dprec -- the dynamic precedence level of R (for GLR parsing).
+
+   RULES[R].merger -- index of merging function for R (for GLR parsing).
+
    RULES[R].line -- the line where R was defined.
 
    RULES[R].useful -- TRUE iff the rule is used (i.e., FALSE if thrown
@@ -103,19 +107,20 @@
 # define ISTOKEN(s)    ((s) < ntokens)
 # define ISVAR(s)      ((s) >= ntokens)
 
-extern int nrules;
 extern int nsyms;
 extern int ntokens;
 extern int nvars;
 
-# define ITEM_NUMBER_MAX INT_MAX
 typedef int item_number_t;
+# define ITEM_NUMBER_MAX ((item_number_t) INT_MAX)
+# define ITEM_NUMBER_MIN ((item_number_t) MIN_MAX)
 extern item_number_t *ritem;
 extern unsigned int nritems;
 
-/* There is weird relationship between item_number_t and
-   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.
+/* There is weird relationship between OT1H item_number_t and OTOH
+   symbol_number_t and rule_number_t: we store the latter in
+   item_number_t.  symbol_number_t are stored as are, while
+   the negation of (rule_number_t + 1) are stored.
 
    Therefore, an symbol_number_t must be a valid item_number_t, and we
    sometimes have to perform the converse transformation.  */
@@ -124,16 +129,28 @@ extern unsigned int nritems;
 
 extern symbol_number_t start_symbol;
 
+/* Rules numbers. */
+typedef short rule_number_t;
+# define RULE_NUMBER_MAX ((rule_number_t) SHRT_MAX)
+extern rule_number_t nrules;
+# define int_of_rule_number(RNum) ((int) (RNum))
+# define rule_number_as_item_number(RNum) ((item_number_t) (- RNum - 1))
+# define item_number_as_rule_number(INum) ((rule_number_t) (- INum - 1))
+
+
+/*--------.
+| Rules.  |
+`--------*/
 
 typedef struct rule_s
 {
   /* The number of the rule in the source.  It is usually the index in
      RULES too, except if there are useless rules.  */
-  short user_number;
+  rule_number_t user_number;
 
   /* The index in RULES.  Usually the rule number in the source,
      except if some rules are useless.  */
-  short number;
+  rule_number_t number;
 
   symbol_t *lhs;
   item_number_t *rhs;
@@ -141,6 +158,9 @@ typedef struct rule_s
   /* This symbol provides both the associativity, and the precedence. */
   symbol_t *prec;
 
+  short dprec;
+  short merger;
+
   /* This symbol was attached to the rule via %prec. */
   symbol_t *precsym;
 
@@ -163,11 +183,22 @@ extern symbol_number_t *token_translations;
 extern int max_user_token_number;
 
 
+/* GLR_PARSER is nonzero if the input file says to use the GLR
+   (Generalized LR) parser, and to output some additional
+   information used by the GLR algorithm. */
+
+extern int glr_parser;
+
 /* PURE_PARSER is nonzero if should generate a parser that is all pure
    and reentrant.  */
 
 extern int pure_parser;
 
+/* Print this RULE's number and lhs on OUT.  If a PREVIOUS_LHS was
+   already displayed (by a previous call for another rule), avoid
+   useless repetitions.  */
+void rule_lhs_print PARAMS ((rule_t *rule, symbol_t *previous_lhs, FILE *out));
+
 /* Return the length of the RHS.  */
 int rule_rhs_length PARAMS ((rule_t *rule));
 
@@ -186,7 +217,8 @@ size_t ritem_longest_rhs PARAMS ((void));
 /* Print the grammar's rules numbers from BEGIN (inclusive) to END
    (exclusive) on OUT under TITLE.  */
 void grammar_rules_partial_print PARAMS ((FILE *out, const char *title,
-                                         int begin, int end));
+                                         rule_number_t begin,
+                                         rule_number_t end));
 
 /* Print the grammar's rules on OUT.  */
 void grammar_rules_print PARAMS ((FILE *out));