Merge remote-tracking branch 'origin/maint'

[bison.git] / src / gram.h

diff --git a/src/gram.h b/src/gram.h
index 3f75dd8f951a9e3ed71397f65c2e181602c08d4e..e502b781b52b973ce6fb67946f04a672e4b5975b 100644 (file)
--- a/src/gram.h
+++ b/src/gram.h
@@ -105,8 +105,8 @@
 # include "location.h"
 # include "symtab.h"
 
 # include "location.h"
 # include "symtab.h"
 

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

 
 extern int nsyms;
 extern int ntokens;
 
 extern int nsyms;
 extern int ntokens;


@@ -194,6 +194,7 @@ typedef struct
 
   location location;
   bool useful;
 
   location location;
   bool useful;

+  bool is_predicate;

 
   const char *action;
   location action_location;
 
   const char *action;
   location action_location;


@@ -223,14 +224,11 @@ void rule_lhs_print (rule *r, symbol *previous_lhs, FILE *out);
 void rule_lhs_print_xml (rule *r, FILE *out, int level);
 
 /* Return the length of the RHS.  */
 void rule_lhs_print_xml (rule *r, FILE *out, int level);
 
 /* Return the length of the RHS.  */

-int rule_rhs_length (rule *r);
+size_t rule_rhs_length (rule *r);

 
 /* Print this rule's RHS on OUT.  */
 void rule_rhs_print (rule *r, FILE *out);
 
 
 /* Print this rule's RHS on OUT.  */
 void rule_rhs_print (rule *r, FILE *out);
 

-/* Print this rule on OUT.  */
-void rule_print (rule *r, FILE *out);
-

 
 
 
 
 
 


@@ -253,7 +251,7 @@ size_t ritem_longest_rhs (void);
 
 /* Print the grammar's rules that match FILTER on OUT under TITLE.  */
 void grammar_rules_partial_print (FILE *out, const char *title,
 
 /* Print the grammar's rules that match FILTER on OUT under TITLE.  */
 void grammar_rules_partial_print (FILE *out, const char *title,

-                                 rule_filter filter);
+                                  rule_filter filter);

 
 /* Print the grammar's useful rules on OUT.  */
 void grammar_rules_print (FILE *out);
 
 /* Print the grammar's useful rules on OUT.  */
 void grammar_rules_print (FILE *out);