Update gnulib.

[bison.git] / src / assoc.c

diff --git a/src/assoc.c b/src/assoc.c
index 226a35198daabc6e1f7060a7856ff167e9150ca6..2ce16f0b5919e852aafc750421958fc86ca01eae 100644 (file)
--- a/src/assoc.c
+++ b/src/assoc.c
@@ -1,32 +1,35 @@
 /* Associativity information.
 /* Associativity information.

-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005, 2006 Free Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    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
    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
    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 "system.h"

+

 #include "assoc.h"
 
 
 const char *
 #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";
 
     case undef_assoc:
       return "undefined associativity";
 


@@ -39,5 +42,4 @@ assoc_to_string (assoc_t assoc)
     case non_assoc:
       return "%nonassoc";
     }
     case non_assoc:
       return "%nonassoc";
     }

-  return NULL;

 }
 }