Rename "default rule" to "default reduction".

[bison.git] / src / tables.h

diff --git a/src/tables.h b/src/tables.h
index 0b7298490ccd10518c0685c11439fd0fcb895fdb..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  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,9 +45,9 @@
 
    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
 
    YYDEFGOTO[I] = default state to go to after a reduction of a rule
    that generates variable NTOKENS + I, except when YYTABLE specifies


@@ -92,25 +90,25 @@
 
 extern int nvectors;
 
 
 extern int nvectors;
 

-typedef int base_t;
-extern base_t *base;
+typedef int base_number;
+extern base_number *base;

 /* A distinguished value of BASE, negative infinite.  During the
 /* A distinguished value of BASE, negative infinite.  During the

-   computation equals to BASE_MIN, later mapped to BASE_NINF to
+   computation equals to BASE_MINIMUM, later mapped to BASE_NINF to

    keep parser tables small.  */
    keep parser tables small.  */

-extern base_t base_ninf;
+extern base_number base_ninf;

 
 extern unsigned int *conflict_table;
 extern unsigned int *conflict_list;
 extern int conflict_list_cnt;
 
 
 extern unsigned int *conflict_table;
 extern unsigned int *conflict_list;
 extern int conflict_list_cnt;
 

-extern base_t *table;
-extern base_t *check;
+extern base_number *table;
+extern base_number *check;

 /* The value used in TABLE to denote explicit syntax errors
    (%nonassoc), a negative infinite.  */
 /* The value used in TABLE to denote explicit syntax errors
    (%nonassoc), a negative infinite.  */

-extern base_t table_ninf;
+extern base_number table_ninf;

 
 

-extern state_number_t *yydefgoto;
-extern rule_number_t *yydefact;
+extern state_number *yydefgoto;
+extern rule_number *yydefact;

 extern int high;
 
 void tables_generate (void);
 extern int high;
 
 void tables_generate (void);