c++: fix several issues with locations

[bison.git] / src / assoc.h

diff --git a/src/assoc.h b/src/assoc.h
index b31c55e2bc4fd183ed17c82887e81b568e90d374..b9475b5d127b50c56a743953d6ec056ef897aa37 100644 (file)
--- a/src/assoc.h
+++ b/src/assoc.h
@@ -1,22 +1,21 @@
 /* Associativity information.
 /* Associativity information.

-   Copyright (C) 2002 Free Software Foundation, Inc.
+
+   Copyright (C) 2002, 2006, 2008-2013 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., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #ifndef ASSOC_H_
 # define ASSOC_H_
 
 #ifndef ASSOC_H_
 # define ASSOC_H_


@@ -24,12 +23,13 @@
 /* Associativity values for tokens and rules.  */
 typedef enum
 {
 /* 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;
 
 } assoc;
 

-char const *assoc_to_string (assoc);
+char const *assoc_to_string (assoc a);

 
 #endif /* !ASSOC_H_ */
 
 #endif /* !ASSOC_H_ */