Merge remote-tracking branch 'origin/maint'

[bison.git] / src / gram.h

diff --git a/src/gram.h b/src/gram.h
index a82a6b40a506399318a3dca0c42ecb76c70daa5d..e502b781b52b973ce6fb67946f04a672e4b5975b 100644 (file)
--- a/src/gram.h
+++ b/src/gram.h
@@ -1,6 +1,6 @@
 /* Data definitions for internal representation of Bison's input.
 
-   Copyright (C) 1984, 1986, 1989, 1992, 2001-2007, 2009-2010 Free
+   Copyright (C) 1984, 1986, 1989, 1992, 2001-2007, 2009-2012 Free
    Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -105,8 +105,8 @@
 # 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;
@@ -194,6 +194,7 @@ typedef struct
 
   location location;
   bool useful;
+  bool is_predicate;
 
   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.  */
-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 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,
-                                 rule_filter filter);
+                                  rule_filter filter);
 
 /* Print the grammar's useful rules on OUT.  */
 void grammar_rules_print (FILE *out);