Merge remote-tracking branch 'origin/maint'

[bison.git] / src / assoc.c

diff --git a/src/assoc.c b/src/assoc.c
index 80a2b43c4fef221a85cb9daf42b017f11fd325d8..5e8b293fa1768e734dd80c243be586ff5e00378f 100644 (file)
--- a/src/assoc.c
+++ b/src/assoc.c
@@ -1,34 +1,39 @@
 /* Associativity information.
-   Copyright (C) 2002 Free Software Foundation, Inc.
+
+   Copyright (C) 2002, 2005-2006, 2008-2012 Free Software Foundation,
+   Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
-   Bison is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   Bison is distributed in the hope that it will be useful,
+   This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with Bison; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#include <config.h>
 #include "system.h"
+
 #include "assoc.h"
 
 
 const char *
-assoc_to_string (assoc_t assoc)
+assoc_to_string (assoc a)
 {
-  switch (assoc)
+  switch (a)
     {
+    default:
+      abort ();
+
     case undef_assoc:
-      return _("undefined associativity");
+      return "undefined associativity";
 
     case right_assoc:
       return "%right";
@@ -38,6 +43,8 @@ assoc_to_string (assoc_t assoc)
 
     case non_assoc:
       return "%nonassoc";
+
+    case precedence_assoc:
+      return "%precedence";
     }
-  return NULL;
 }