Sync.

[bison.git] / src / derives.c

diff --git a/src/derives.c b/src/derives.c
index 7e20fe5a29f0d7153c7b67c4b2205be143955a31..24fde5d2d6ff576fe1ab3b42ff3dbc8ccac2530a 100644 (file)
--- a/src/derives.c
+++ b/src/derives.c
@@ -17,8 +17,8 @@
 
    You should have received a copy of the GNU General Public License
    along with Bison; see the file COPYING.  If not, write to
 
    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.  */
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */

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


@@ -37,7 +37,7 @@ typedef struct rule_list
   rule *value;
 } rule_list;
 
   rule *value;
 } rule_list;
 

-rule ***derives = NULL;
+rule ***derives;

 
 static void
 print_derives (void)
 
 static void
 print_derives (void)


@@ -70,12 +70,12 @@ derives_compute (void)
 
   /* DSET[NTERM - NTOKENS] -- A linked list of the numbers of the rules
      whose LHS is NTERM.  */
 
   /* DSET[NTERM - NTOKENS] -- A linked list of the numbers of the rules
      whose LHS is NTERM.  */

-  rule_list **dset = CALLOC (dset, nvars);
+  rule_list **dset = xcalloc (nvars, sizeof *dset);

 
   /* DELTS[RULE] -- There are NRULES rule number to attach to nterms.
      Instead of performing NRULES allocations for each, have an array
      indexed by rule numbers.  */
 
   /* DELTS[RULE] -- There are NRULES rule number to attach to nterms.
      Instead of performing NRULES allocations for each, have an array
      indexed by rule numbers.  */

-  rule_list *delts = CALLOC (delts, nrules);
+  rule_list *delts = xnmalloc (nrules, sizeof *delts);

 
   for (r = nrules - 1; r >= 0; --r)
     {
 
   for (r = nrules - 1; r >= 0; --r)
     {


@@ -90,8 +90,8 @@ derives_compute (void)
   /* DSET contains what we need under the form of a linked list.  Make
      it a single array.  */
 
   /* DSET contains what we need under the form of a linked list.  Make
      it a single array.  */
 

-  CALLOC (derives, nvars);
-  CALLOC (q, nvars + nrules);
+  derives = xnmalloc (nvars, sizeof *derives);
+  q = xnmalloc (nvars + nrules, sizeof *q);

 
   for (i = ntokens; i < nsyms; i++)
     {
 
   for (i = ntokens; i < nsyms; i++)
     {


@@ -116,6 +116,6 @@ derives_compute (void)
 void
 derives_free (void)
 {
 void
 derives_free (void)
 {

-  XFREE (derives[0]);
-  XFREE (derives);
+  free (derives[0]);
+  free (derives);

 }
 }