Merge remote-tracking branch 'origin/maint'

[bison.git] / src / assoc.c

diff --git a/src/assoc.c b/src/assoc.c
index 308e2e8777045027886789f86b4ad8fa7d2db0f7..5e8b293fa1768e734dd80c243be586ff5e00378f 100644 (file)
--- a/src/assoc.c
+++ b/src/assoc.c
@@ -1,5 +1,6 @@
 /* Associativity information.
 /* Associativity information.

-   Copyright (C) 2002, 2005-2006, 2009-2010 Free Software Foundation,
+
+   Copyright (C) 2002, 2005-2006, 2008-2012 Free Software Foundation,

    Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
    Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.


@@ -42,5 +43,8 @@ assoc_to_string (assoc a)
 
     case non_assoc:
       return "%nonassoc";
 
     case non_assoc:
       return "%nonassoc";

+
+    case precedence_assoc:
+      return "%precedence";

     }
 }
     }
 }