#include "conflicts.h"
#include "muscle_tab.h"
-int lineno;
static symbol_list_t *grammar = NULL;
static int start_flag = 0;
merger_list *merge_functions;
`-------------------------------------------------------------------*/
static int
-get_merge_function (const char* name, const char* type)
+get_merge_function (const char* name, const char* type,
+ location_t loc)
{
merger_list *syms;
merger_list head;
type = "";
head.next = merge_functions;
- for (syms = &head, n = 1; syms->next != NULL; syms = syms->next, n += 1)
+ for (syms = &head, n = 1; syms->next != NULL; syms = syms->next, n += 1)
if (strcmp (name, syms->next->name) == 0)
break;
- if (syms->next == NULL) {
- syms->next = XMALLOC (merger_list, 1);
- syms->next->name = strdup (name);
- syms->next->type = strdup (type);
- syms->next->next = NULL;
- merge_functions = head.next;
- } else if (strcmp (type, syms->next->type) != 0)
- warn (_("result type clash on merge function %s: `%s' vs. `%s'"),
- name, type, syms->next->type);
+ if (syms->next == NULL)
+ {
+ syms->next = XMALLOC (merger_list, 1);
+ syms->next->name = xstrdup (name);
+ syms->next->type = xstrdup (type);
+ syms->next->next = NULL;
+ merge_functions = head.next;
+ }
+ else if (strcmp (type, syms->next->type) != 0)
+ warn_at (loc, _("result type clash on merge function %s: `%s' vs. `%s'"),
+ name, type, syms->next->type);
return n;
}
}
}
-/*-------------------------------------------------------------------.
-| Generate a dummy symbol, a nonterminal, whose name cannot conflict |
-| with the user's names. |
-`-------------------------------------------------------------------*/
-
-static symbol_t *
-gensym (location_t location)
-{
- /* Incremented for each generated symbol */
- static int gensym_count = 0;
- static char buf[256];
-
- symbol_t *sym;
-
- sprintf (buf, "@%d", ++gensym_count);
- sym = getsym (buf, location);
- sym->class = nterm_sym;
- sym->number = nvars++;
- return sym;
-}
\f
/*-------------------------------------------------------------------.
-| Parse the input grammar into a one symbol_list_t structure. Each |
+| Parse the input grammar into a one symbol_list_t structure. Each |
| rule is represented by a sequence of symbols: the left hand side |
| followed by the contents of the right hand side, followed by a |
| null pointer instead of a symbol to terminate the rule. The next |
/* Make a DUMMY nonterminal, whose location is that of the midrule
action. Create the MIDRULE. */
location_t dummy_location = current_rule->action_location;
- symbol_t *dummy = gensym (dummy_location);
+ symbol_t *dummy = dummy_symbol_get (dummy_location);
symbol_list_t *midrule = symbol_list_new (dummy, dummy_location);
/* Make a new rule, whose body is empty, before the current one, so
warn_at (location, _("%%dprec affects only GLR parsers"));
if (dprec <= 0)
complain_at (location, _("%%dprec must be followed by positive number"));
- else if (current_rule->dprec != 0)
+ else if (current_rule->dprec != 0)
complain_at (location, _("only one %%dprec allowed per rule"));
current_rule->dprec = dprec;
}
{
if (! glr_parser)
warn_at (location, _("%%merge affects only GLR parsers"));
- if (current_rule->merger != 0)
+ if (current_rule->merger != 0)
complain_at (location, _("only one %%merge allowed per rule"));
- current_rule->merger =
- get_merge_function (name, current_rule->sym->type_name);
+ current_rule->merger =
+ get_merge_function (name, current_rule->sym->type_name, location);
}
/* Attach a SYMBOL to the current rule. If needed, move the previous
static void
packgram (void)
{
- unsigned int itemno;
- int ruleno;
- symbol_list_t *p;
+ unsigned int itemno = 0;
+ rule_number_t ruleno = 0;
+ symbol_list_t *p = grammar;
ritem = XCALLOC (item_number_t, nritems);
- rules = XCALLOC (rule_t, nrules) - 1;
+ rules = XCALLOC (rule_t, nrules);
- itemno = 0;
- ruleno = 1;
-
- p = grammar;
while (p)
{
symbol_t *ruleprec = p->ruleprec;
rules[ruleno].precsym = ruleprec;
rules[ruleno].prec = ruleprec;
}
- ritem[itemno++] = -ruleno;
+ ritem[itemno++] = rule_number_as_item_number (ruleno);
++ruleno;
if (p)
assert (itemno == nritems);
- if (trace_flag)
+ if (trace_flag & trace_sets)
ritem_print (stderr);
}
\f
reader (void)
{
gram_control_t gram_control;
- lineno = 1;
/* Initialize the symbol table. */
symbols_new ();
- /* Construct the axiom symbol. */
- axiom = getsym ("$axiom", empty_location);
- axiom->class = nterm_sym;
- axiom->number = nvars++;
+ /* Construct the accept symbol. */
+ accept = symbol_get ("$accept", empty_location);
+ accept->class = nterm_sym;
+ accept->number = nvars++;
/* Construct the error token */
- errtoken = getsym ("error", empty_location);
+ errtoken = symbol_get ("error", empty_location);
errtoken->class = token_sym;
errtoken->number = ntokens++;
/* Construct a token that represents all undefined literal tokens.
It is always token number 2. */
- undeftoken = getsym ("$undefined.", empty_location);
+ undeftoken = symbol_get ("$undefined", empty_location);
undeftoken->class = token_sym;
undeftoken->number = ntokens++;
scanner_initialize ();
gram_parse (&gram_control);
+ /* If something went wrong during the parsing, don't try to
+ continue. */
+ if (complain_message_count)
+ exit (1);
+
/* Grammar has been read. Do some checking */
if (nrules == 0)
fatal (_("no rules in the input grammar"));
/* Report any undefined symbols and consider them nonterminals. */
symbols_check_defined ();
- /* If the user did not define her EOFTOKEN, do it now. */
- if (!eoftoken)
+ /* If the user did not define her ENDTOKEN, do it now. */
+ if (!endtoken)
{
- eoftoken = getsym ("$", empty_location);
- eoftoken->class = token_sym;
- eoftoken->number = 0;
+ endtoken = symbol_get ("$end", empty_location);
+ endtoken->class = token_sym;
+ endtoken->number = 0;
/* Value specified by POSIX. */
- eoftoken->user_token_number = 0;
+ endtoken->user_token_number = 0;
}
/* Insert the initial rule, which line is that of the first rule
(not that of the start symbol):
- axiom: %start EOF. */
+ accept: %start EOF. */
{
- symbol_list_t *p = symbol_list_new (axiom, empty_location);
+ symbol_list_t *p = symbol_list_new (accept, empty_location);
p->location = grammar->location;
p->next = symbol_list_new (startsymbol, empty_location);
- p->next->next = symbol_list_new (eoftoken, empty_location);
+ p->next->next = symbol_list_new (endtoken, empty_location);
p->next->next->next = symbol_list_new (NULL, empty_location);
p->next->next->next->next = grammar;
nrules += 1;
projects / bison.git / blobdiff