Merge remote-tracking branch 'origin/maint'

[bison.git] / src / assoc.h

diff --git a/src/assoc.h b/src/assoc.h
index d900caff9684c01f2605a5aa1a9c4005c48b171c..44f8573be8e3e3fe5411a8a292e1fe12be1e4f93 100644 (file)
--- a/src/assoc.h
+++ b/src/assoc.h
@@ -1,5 +1,6 @@
 /* Associativity information.
-   Copyright (C) 2002, 2006 Free Software Foundation, Inc.
+
+   Copyright (C) 2002, 2006, 2008-2012 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -22,10 +23,11 @@
 /* Associativity values for tokens and rules.  */
 typedef enum
 {
-  undef_assoc,
-  right_assoc,
-  left_assoc,
-  non_assoc
+  undef_assoc,     /** Not defined. */
+  right_assoc,     /** %right */
+  left_assoc,      /** %left */
+  non_assoc,       /** %nonassoc */
+  precedence_assoc /** %precedence */
 } assoc;
 
 char const *assoc_to_string (assoc a);