projects
/
bison.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Java: Fix syntax error handling without error token.
[bison.git]
/
src
/
derives.c
diff --git
a/src/derives.c
b/src/derives.c
index da881ecc521e8277974e22adcb88a24c6c39b94b..ce5a6a5fb61e63fd8bf41b1248b25d01594be9f9 100644
(file)
--- a/
src/derives.c
+++ b/
src/derives.c
@@
-1,26
+1,24
@@
/* Match rules with nonterminals for bison,
/* Match rules with nonterminals for bison,
- Copyright (C) 1984, 1989, 2000
, 2001, 200
2 Free Software
+ Copyright (C) 1984, 1989, 2000
-2003, 2005, 2009-201
2 Free Software
Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
Foundation, Inc.
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/>. */
+#include <config.h>
#include "system.h"
#include "getargs.h"
#include "system.h"
#include "getargs.h"
@@
-37,7
+35,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)
@@
-65,17
+63,17
@@
void
derives_compute (void)
{
symbol_number i;
derives_compute (void)
{
symbol_number i;
-
int
r;
+
rule_number
r;
rule **q;
/* DSET[NTERM - NTOKENS] -- A linked list of the numbers of the rules
whose LHS is NTERM. */
rule **q;
/* 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, nrule
s);
+ rule_list *delts =
xnmalloc (nrules, sizeof *delt
s);
for (r = nrules - 1; r >= 0; --r)
{
for (r = nrules - 1; r >= 0; --r)
{
@@
-90,8
+88,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, nvar
s);
-
CALLOC (q, nvars + nrules
);
+
derives = xnmalloc (nvars, sizeof *derive
s);
+
q = xnmalloc (nvars + nrules, sizeof *q
);
for (i = ntokens; i < nsyms; i++)
{
for (i = ntokens; i < nsyms; i++)
{
@@
-116,6
+114,6
@@
derives_compute (void)
void
derives_free (void)
{
void
derives_free (void)
{
-
XFREE
(derives[0]);
-
XFREE
(derives);
+
free
(derives[0]);
+
free
(derives);
}
}