deterministic user-token-number redeclaration errors.

[bison.git] / src / tables.h

diff --git a/src/tables.h b/src/tables.h
index 962b73671d82b1b1e1e4504082c7f1d0758da65e..a44cdb863a1ba4c826f75538007cff62af6cc7a8 100644 (file)
--- a/src/tables.h
+++ b/src/tables.h
@@ -1,22 +1,20 @@
 /* Prepare the LALR and GLR parser tables.
 /* Prepare the LALR and GLR parser tables.

-   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2009 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 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.
+   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 3 of the License, or
+   (at your option) any later version.

 
 

-   Bison 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.
+   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
 
    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/>.  */

 
 #ifndef TABLES_H_
 # define TABLES_H_
 
 #ifndef TABLES_H_
 # define TABLES_H_


@@ -47,16 +45,16 @@
 
    YYSTOS[S] = the symbol number of the symbol that leads to state S.
 
 
    YYSTOS[S] = the symbol number of the symbol that leads to state S.
 

-   YYDEFACT[S] = default rule to reduce with in state s, when YYTABLE
-   doesn't specify something else to do.  Zero means the default is an
-   error.
+   YYDEFACT[S] = default reduction number in state s.  Performed when
+   YYTABLE doesn't specify something else to do.  Zero means the default
+   is an error.

 
    YYDEFGOTO[I] = default state to go to after a reduction of a rule
    that generates variable NTOKENS + I, except when YYTABLE specifies
    something else to do.
 
    YYPACT[S] = index in YYTABLE of the portion describing state S.
 
    YYDEFGOTO[I] = default state to go to after a reduction of a rule
    that generates variable NTOKENS + I, except when YYTABLE specifies
    something else to do.
 
    YYPACT[S] = index in YYTABLE of the portion describing state S.

-   The look-ahead token's type is used to index that portion to find
+   The lookahead token's type is used to index that portion to find

    out what to do.
 
    If the value in YYTABLE is positive, we shift the token and go to
    out what to do.
 
    If the value in YYTABLE is positive, we shift the token and go to