* src/output.c (pack_vector): Use assert, not berror.

* src/main.c (berror): Remove, unused.

diff --git a/ChangeLog b/ChangeLog
index f61c54d11cd78d942afc73728d53057e1ffbaaf9..1a82636cbc2cfa11bfc1210af1e3388d6b93ce27 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-05  Akim Demaille  <akim@epita.fr>
+
+       * src/output.c (pack_vector): Use assert, not berror.
+       * src/main.c (berror): Remove, unused.
+

 2001-12-05  Akim Demaille  <akim@epita.fr>
 
        New experimental feature: if --verbose --trace output all the
 2001-12-05  Akim Demaille  <akim@epita.fr>
 
        New experimental feature: if --verbose --trace output all the

diff --git a/src/main.c b/src/main.c
index 3999fd2a28056717f4878d70742c12fe21fb4942..e811bac20eb485c7505d1431175d777007c31681 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,5 @@
 /* Top level entry point of bison,
 /* Top level entry point of bison,

-   Copyright 1984, 1986, 1989, 1992, 1995, 2000
+   Copyright 1984, 1986, 1989, 1992, 1995, 2000, 2001

    Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
    Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.


@@ -40,7 +40,6 @@
 /* The name this program was run with, for messages.  */
 char *program_name;
 
 /* The name this program was run with, for messages.  */
 char *program_name;
 

-extern void berror PARAMS((const char *));

 
 int
 main (int argc, char *argv[])
 
 int
 main (int argc, char *argv[])


@@ -124,12 +123,3 @@ main (int argc, char *argv[])
 
   return complain_message_count ? EXIT_FAILURE : EXIT_SUCCESS;
 }
 
   return complain_message_count ? EXIT_FAILURE : EXIT_SUCCESS;
 }

-\f
-/* Abort for an internal error denoted by string S.  */
-
-void
-berror (const char *s)
-{
-  fprintf (stderr, _("%s: internal error: %s\n"), program_name, s);
-  abort ();
-}

diff --git a/src/output.c b/src/output.c
index 053cab5b44ced8a75ae5c7d6b8f3bcbcb37347d3..2dbf480bc84ef79b299e56e4eaf9f0820894d045 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -103,9 +103,6 @@
 #include "reader.h"
 #include "conflicts.h"
 
 #include "reader.h"
 #include "conflicts.h"
 

-extern void berror PARAMS((const char *));
-
-

 
 static int nvectors;
 static int nentries;
 
 static int nvectors;
 static int nentries;


@@ -980,8 +977,8 @@ pack_vector (int vector)
        }
     }
 
        }
     }
 

-  berror ("pack_vector");
-  return 0;                    /* JF keep lint happy */
+  assert (!"pack_vector");
+  return 0;

 }
 
 
 }