X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/637c4b283c0c39542f241644dc4dd733ba94ce1b..6f04ee6c78ba01f9d8e02dbe2baace0c3bd8f4fd:/src/gram.c
diff --git a/src/gram.c b/src/gram.c
index 74fd5d57..76acceec 100644
--- a/src/gram.c
+++ b/src/gram.c
@@ -1,99 +1,77 @@
-/* Allocate input grammar variables for bison,
- Copyright (C) 1984, 1986, 1989, 2001, 2002 Free Software Foundation, Inc.
+/* Allocate input grammar variables for Bison.
+
+ Copyright (C) 1984, 1986, 1989, 2001-2003, 2005-2011 Free Software
+ 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
- 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
- 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 . */
+#include
#include "system.h"
-#include "quotearg.h"
-#include "symtab.h"
+
+#include
+
+#include "complain.h"
#include "gram.h"
-#include "reduce.h"
+#include "print-xml.h"
#include "reader.h"
+#include "reduce.h"
+#include "symtab.h"
/* Comments for these variables are in gram.h. */
-item_number_t *ritem = NULL;
+item_number *ritem = NULL;
unsigned int nritems = 0;
-rule_t *rules = NULL;
-rule_number_t nrules = 0;
+rule *rules = NULL;
+rule_number nrules = 0;
-symbol_t **symbols = NULL;
+symbol **symbols = NULL;
int nsyms = 0;
int ntokens = 1;
int nvars = 0;
-symbol_number_t *token_translations = NULL;
+symbol_number *token_translations = NULL;
int max_user_token_number = 256;
-int glr_parser = 0;
-int pure_parser = 0;
-
-
-/*--------------------------------------------------------------.
-| Return true IFF the rule has a `number' smaller than NRULES. |
-`--------------------------------------------------------------*/
-
bool
-rule_useful_p (rule_t *r)
+rule_useful_in_grammar_p (rule *r)
{
return r->number < nrules;
}
-
-/*-------------------------------------------------------------.
-| Return true IFF the rule has a `number' higher than NRULES. |
-`-------------------------------------------------------------*/
-
bool
-rule_useless_p (rule_t *r)
+rule_useless_in_grammar_p (rule *r)
{
- return r->number >= nrules;
+ return !rule_useful_in_grammar_p (r);
}
-
-/*--------------------------------------------------------------------.
-| Return true IFF the rule is not flagged as useful *and* is useful. |
-| In other words, it was discarded because of conflicts. |
-`--------------------------------------------------------------------*/
-
bool
-rule_never_reduced_p (rule_t *r)
+rule_useless_in_parser_p (rule *r)
{
- return !r->useful && r->number < nrules;
+ return !r->useful && rule_useful_in_grammar_p (r);
}
-
-/*----------------------------------------------------------------.
-| Print this RULE's number and lhs on OUT. If a PREVIOUS_LHS was |
-| already displayed (by a previous call for another rule), avoid |
-| useless repetitions. |
-`----------------------------------------------------------------*/
-
void
-rule_lhs_print (rule_t *rule, symbol_t *previous_lhs, FILE *out)
+rule_lhs_print (rule *r, symbol *previous_lhs, FILE *out)
{
- fprintf (out, " %3d ", rule->number);
- if (previous_lhs != rule->lhs)
+ fprintf (out, " %3d ", r->number);
+ if (previous_lhs != r->lhs)
{
- fprintf (out, "%s:", rule->lhs->tag);
+ fprintf (out, "%s:", r->lhs->tag);
}
else
{
@@ -104,34 +82,30 @@ rule_lhs_print (rule_t *rule, symbol_t *previous_lhs, FILE *out)
}
}
-
-/*--------------------------------------.
-| Return the number of symbols in RHS. |
-`--------------------------------------*/
+void
+rule_lhs_print_xml (rule *r, FILE *out, int level)
+{
+ xml_printf (out, level, "%s", r->lhs->tag);
+}
int
-rule_rhs_length (rule_t *rule)
+rule_rhs_length (rule *r)
{
int res = 0;
- item_number_t *rhsp;
- for (rhsp = rule->rhs; *rhsp >= 0; ++rhsp)
+ item_number *rhsp;
+ for (rhsp = r->rhs; *rhsp >= 0; ++rhsp)
++res;
return res;
}
-
-/*-------------------------------.
-| Print this RULE's RHS on OUT. |
-`-------------------------------*/
-
void
-rule_rhs_print (rule_t *rule, FILE *out)
+rule_rhs_print (rule *r, FILE *out)
{
- if (*rule->rhs >= 0)
+ if (*r->rhs >= 0)
{
- item_number_t *r;
- for (r = rule->rhs; *r >= 0; r++)
- fprintf (out, " %s", symbols[*r]->tag);
+ item_number *rp;
+ for (rp = r->rhs; *rp >= 0; rp++)
+ fprintf (out, " %s", symbols[*rp]->tag);
fputc ('\n', out);
}
else
@@ -140,23 +114,33 @@ rule_rhs_print (rule_t *rule, FILE *out)
}
}
-
-/*-------------------------.
-| Print this RULE on OUT. |
-`-------------------------*/
+static void
+rule_rhs_print_xml (rule *r, FILE *out, int level)
+{
+ if (*r->rhs >= 0)
+ {
+ item_number *rp;
+ xml_puts (out, level, "");
+ for (rp = r->rhs; *rp >= 0; rp++)
+ xml_printf (out, level + 1, "%s",
+ xml_escape (symbols[*rp]->tag));
+ xml_puts (out, level, "");
+ }
+ else
+ {
+ xml_puts (out, level, "");
+ xml_puts (out, level + 1, "");
+ xml_puts (out, level, "");
+ }
+}
void
-rule_print (rule_t *rule, FILE *out)
+rule_print (rule *r, FILE *out)
{
- fprintf (out, "%s:", rule->lhs->tag);
- rule_rhs_print (rule, out);
+ fprintf (out, "%s:", r->lhs->tag);
+ rule_rhs_print (r, out);
}
-
-/*------------------------.
-| Dump RITEM for traces. |
-`------------------------*/
-
void
ritem_print (FILE *out)
{
@@ -170,16 +154,11 @@ ritem_print (FILE *out)
fputs ("\n\n", out);
}
-
-/*------------------------------------------.
-| Return the size of the longest rule RHS. |
-`------------------------------------------*/
-
size_t
ritem_longest_rhs (void)
{
int max = 0;
- rule_number_t r;
+ rule_number r;
for (r = 0; r < nrules; ++r)
{
@@ -191,18 +170,13 @@ ritem_longest_rhs (void)
return max;
}
-
-/*-----------------------------------------------------------------.
-| Print the grammar's rules that match FILTER on OUT under TITLE. |
-`-----------------------------------------------------------------*/
-
void
grammar_rules_partial_print (FILE *out, const char *title,
- rule_filter_t filter)
+ rule_filter filter)
{
- int r;
+ rule_number r;
bool first = true;
- symbol_t *previous_lhs = NULL;
+ symbol *previous_lhs = NULL;
/* rule # : LHS -> RHS */
for (r = 0; r < nrules + nuseless_productions; r++)
@@ -222,21 +196,48 @@ grammar_rules_partial_print (FILE *out, const char *title,
fputs ("\n\n", out);
}
-
-/*------------------------------------------.
-| Print the grammar's useful rules on OUT. |
-`------------------------------------------*/
-
void
grammar_rules_print (FILE *out)
{
- grammar_rules_partial_print (out, _("Grammar"), rule_useful_p);
+ grammar_rules_partial_print (out, _("Grammar"), rule_useful_in_grammar_p);
}
+void
+grammar_rules_print_xml (FILE *out, int level)
+{
+ rule_number r;
+ bool first = true;
-/*-------------------.
-| Dump the grammar. |
-`-------------------*/
+ for (r = 0; r < nrules + nuseless_productions; r++)
+ {
+ if (first)
+ xml_puts (out, level + 1, "");
+ first = false;
+ {
+ char const *usefulness;
+ if (rule_useless_in_grammar_p (&rules[r]))
+ usefulness = "useless-in-grammar";
+ else if (rule_useless_in_parser_p (&rules[r]))
+ usefulness = "useless-in-parser";
+ else
+ usefulness = "useful";
+ xml_indent (out, level + 2);
+ fprintf (out, "tag));
+ fputs (">\n", out);
+ }
+ rule_lhs_print_xml (&rules[r], out, level + 3);
+ rule_rhs_print_xml (&rules[r], out, level + 3);
+ xml_puts (out, level + 2, "");
+ }
+ if (!first)
+ xml_puts (out, level + 1, "");
+ else
+ xml_puts (out, level + 1, "");
+}
void
grammar_dump (FILE *out, const char *title)
@@ -249,7 +250,7 @@ grammar_dump (FILE *out, const char *title)
fprintf (out, "Variables\n---------\n\n");
{
- symbol_number_t i;
+ symbol_number i;
fprintf (out, "Value Sprec Sassoc Tag\n");
for (i = ntokens; i < nsyms; i++)
@@ -262,36 +263,36 @@ grammar_dump (FILE *out, const char *title)
fprintf (out, "Rules\n-----\n\n");
{
- rule_number_t i;
+ rule_number i;
fprintf (out, "Num (Prec, Assoc, Useful, Ritem Range) Lhs -> Rhs (Ritem range) [Num]\n");
for (i = 0; i < nrules + nuseless_productions; i++)
{
- rule_t *rule = &rules[i];
- item_number_t *r = NULL;
- unsigned int rhs_itemno = rule->rhs - ritem;
- unsigned int rhs_count = 0;
+ rule *rule_i = &rules[i];
+ item_number *rp = NULL;
+ unsigned int rhs_itemno = rule_i->rhs - ritem;
+ unsigned int rhs_count = 0;
/* Find the last RHS index in ritems. */
- for (r = rule->rhs; *r >= 0; ++r)
+ for (rp = rule_i->rhs; *rp >= 0; ++rp)
++rhs_count;
fprintf (out, "%3d (%2d, %2d, %2d, %2u-%2u) %2d ->",
i,
- rule->prec ? rule->prec->prec : 0,
- rule->prec ? rule->prec->assoc : 0,
- rule->useful,
+ rule_i->prec ? rule_i->prec->prec : 0,
+ rule_i->prec ? rule_i->prec->assoc : 0,
+ rule_i->useful,
rhs_itemno,
rhs_itemno + rhs_count - 1,
- rule->lhs->number);
+ rule_i->lhs->number);
/* Dumped the RHS. */
- for (r = rule->rhs; *r >= 0; r++)
- fprintf (out, " %3d", *r);
- fprintf (out, " [%d]\n", item_number_as_rule_number (*r));
+ for (rp = rule_i->rhs; *rp >= 0; rp++)
+ fprintf (out, " %3d", *rp);
+ fprintf (out, " [%d]\n", item_number_as_rule_number (*rp));
}
}
fprintf (out, "\n\n");
fprintf (out, "Rules interpreted\n-----------------\n\n");
{
- rule_number_t r;
+ rule_number r;
for (r = 0; r < nrules + nuseless_productions; r++)
{
fprintf (out, "%-5d ", r);
@@ -301,34 +302,26 @@ grammar_dump (FILE *out, const char *title)
fprintf (out, "\n\n");
}
-
-/*------------------------------------------------------------------.
-| Report on STDERR the rules that are not flagged USEFUL, using the |
-| MESSAGE (which can be `useless rule' when invoked after grammar |
-| reduction, or `never reduced' after conflicts were taken into |
-| account). |
-`------------------------------------------------------------------*/
-
void
-grammar_rules_never_reduced_report (const char *message)
+grammar_rules_useless_report (const char *message)
{
- rule_number_t r;
+ rule_number r;
for (r = 0; r < nrules ; ++r)
if (!rules[r].useful)
{
- LOCATION_PRINT (stderr, rules[r].location);
- fprintf (stderr, ": %s: %s: ",
- _("warning"), message);
- rule_print (&rules[r], stderr);
+ warn_at (rules[r].location, "%s: ", message);
+ rule_print (&rules[r], stderr);
+ fflush (stderr);
}
}
void
grammar_free (void)
{
- XFREE (ritem);
+ if (ritem)
+ free (ritem - 1);
free (rules);
- XFREE (token_translations);
+ free (token_translations);
/* Free the symbol table data structure. */
symbols_free ();
free_merger_functions ();