Instead of using make_symbol<TOK_FOO>, generate make_FOO for each token type.

[bison.git] / src / nullable.c

diff --git a/src/nullable.c b/src/nullable.c
index d41aabebc423e2ef75cfed9de0c3531651b38165..7ee661201ec4aeed6f3cb320ecd6aef6b09acd95 100644 (file)
--- a/src/nullable.c
+++ b/src/nullable.c
@@ -1,30 +1,29 @@
 /* Calculate which nonterminals can expand into the null string for Bison.
 
 /* Calculate which nonterminals can expand into the null string for Bison.
 

-   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2003, 2004 Free
-   Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2003, 2004, 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/>.  */

 
 
 /* Set up NULLABLE, a vector saying which nonterminals can expand into
    the null string.  NULLABLE[I - NTOKENS] is nonzero if symbol I can
    do so.  */
 
 
 
 /* Set up NULLABLE, a vector saying which nonterminals can expand into
    the null string.  NULLABLE[I - NTOKENS] is nonzero if symbol I can
    do so.  */
 

+#include <config.h>

 #include "system.h"
 
 #include "getargs.h"
 #include "system.h"
 
 #include "getargs.h"


@@ -103,8 +102,8 @@ nullable_compute (void)
        else
          {
            /* This rule has an empty RHS. */
        else
          {
            /* This rule has an empty RHS. */

-           if (item_number_as_rule_number (rules_ruleno->rhs[0]) != ruleno)
-             abort ();
+           aver (item_number_as_rule_number (rules_ruleno->rhs[0])
+                 == ruleno);

            if (rules_ruleno->useful
                && ! nullable[rules_ruleno->lhs->number - ntokens])
              {
            if (rules_ruleno->useful
                && ! nullable[rules_ruleno->lhs->number - ntokens])
              {