* data/glr.c (YYRHSLOC): Move its definition next to its uses.

[bison.git] / src / tables.h

diff --git a/src/tables.h b/src/tables.h
index 0b7298490ccd10518c0685c11439fd0fcb895fdb..962b73671d82b1b1e1e4504082c7f1d0758da65e 100644 (file)
--- a/src/tables.h
+++ b/src/tables.h
@@ -1,5 +1,5 @@
 /* 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 Free Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -56,7 +56,7 @@
    something else to do.
 
    YYPACT[S] = index in YYTABLE of the portion describing state S.
    something else to do.
 
    YYPACT[S] = index in YYTABLE of the portion describing state S.

-   The lookahead token's type is used to index that portion to find
+   The look-ahead 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


@@ -92,25 +92,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);