Merge remote-tracking branch 'origin/maint'

[bison.git] / src / assoc.c

diff --git a/src/assoc.c b/src/assoc.c
index 259877e858b10c611e32974942f89cc73a743503..d2eec31574e2994bc1d955f19c7b0885c22874d5 100644 (file)
--- a/src/assoc.c
+++ b/src/assoc.c
@@ -1,5 +1,7 @@
 /* Associativity information.
-   Copyright (C) 2002, 2005, 2006, 2009 Free Software Foundation, Inc.
+
+   Copyright (C) 2002, 2005-2006, 2008-2013 Free Software Foundation,
+   Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -41,5 +43,8 @@ assoc_to_string (assoc a)
 
     case non_assoc:
       return "%nonassoc";
+
+    case precedence_assoc:
+      return "%precedence";
     }
 }