/* Input parser for bison
- Copyright 1984, 1986, 1989, 1992, 1998, 2000
+ Copyright 1984, 1986, 1989, 1992, 1998, 2000, 2001
Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
#include "quote.h"
#include "getargs.h"
#include "files.h"
-#include "xalloc.h"
#include "symtab.h"
#include "lex.h"
#include "gram.h"
#include "reader.h"
#include "conflicts.h"
-/* Number of slots allocated (but not necessarily used yet) in `rline' */
-static int rline_allocated;
-
typedef struct symbol_list
{
struct symbol_list *next;
bucket *sym;
+ int line;
bucket *ruleprec;
}
symbol_list;
static bucket *errtoken;
static bucket *undeftoken;
+
+
+static symbol_list *
+symbol_list_new (bucket *sym)
+{
+ symbol_list *res = XMALLOC (symbol_list, 1);
+ res->next = NULL;
+ res->sym = sym;
+ res->line = lineno;
+ res->ruleprec = NULL;
+ return res;
+}
+
\f
/*===================\
`--------------------------------------------------------------*/
static char *
-get_type_name (int n, symbol_list * rule)
+get_type_name (int n, symbol_list *rule)
{
int i;
symbol_list *rp;
/*-----------------------------------------------------------------.
| FIN is pointing to a location (i.e., a `@'). Output to OOUT a |
| reference to this location. STACK_OFFSET is the number of values |
-| in the current rule so far, which says where to find `$0' with |
+| in the current rule so far, which says where to find `@0' with |
| respect to the top of the stack. |
`-----------------------------------------------------------------*/
static inline void
-copy_at (FILE *fin, struct obstack *oout, int stack_offset)
+copy_at (FILE *fin, struct obstack *oout,
+ struct symbol_list *rule, int stack_offset)
{
+ symbol_list *rp;
int c;
c = getc (fin);
}
else if (isdigit (c) || c == '-')
{
- int n;
+ int n, i;
ungetc (c, fin);
n = read_signed_integer (fin);
+ rp = rule;
+ i = 0;
+
+ while (i < n)
+ {
+ rp = rp->next;
+ if (rp == NULL)
+ {
+ complain (_("invalid @ value"));
+ return;
+ }
+ i++;
+ }
+
obstack_fgrow1 (oout, "yylsp[%d]", n - stack_offset);
locations_flag = 1;
}
else
{
complain (_("`%s' is invalid in %s"),
- token_buffer, (what_is == token_sym) ? "%token" : "%nterm");
+ token_buffer,
+ (what_is == token_sym) ? "%token" : "%nterm");
skip_to_char ('%');
}
}
}
prev = t;
-
}
}
{
int c;
int count = 0;
+ const char *prologue = "\
+#ifndef YYSTYPE\n\
+typedef union";
+ const char *epilogue = "\
+ yystype;\n\
+# define YYSTYPE yystype\n\
+#endif\n";
if (typed)
complain (_("multiple %s declarations"), "%union");
else
obstack_1grow (&attrs_obstack, '\n');
- obstack_sgrow (&attrs_obstack, "typedef union");
+ obstack_sgrow (&attrs_obstack, prologue);
if (defines_flag)
- obstack_sgrow (&defines_obstack, "typedef union");
+ obstack_sgrow (&defines_obstack, prologue);
c = getc (finput);
count--;
if (count <= 0)
{
- obstack_sgrow (&attrs_obstack, " YYSTYPE;\n");
+ obstack_sgrow (&attrs_obstack, epilogue);
if (defines_flag)
- obstack_sgrow (&defines_obstack, " YYSTYPE;\n");
+ obstack_sgrow (&defines_obstack, epilogue);
/* JF don't choke on trailing semi */
c = skip_white_space ();
if (c != ';')
token_t token;
struct bucket *symbol;
char *typename = 0;
- int usrtoknum;
+ int usrtoknum = SUNDEF;
token = lex (); /* fetch typename or first token */
if (token == tok_typename)
usrtoknum = numval;
token = lex (); /* okay, did number, now get literal */
}
- else
- usrtoknum = 0;
/* process literal string token */
}
-/*-----------------------------------------------------------------------------.
-| Parse a double quoted parameter. It was used for %{source,header}_extension. |
-| For the moment, It is not used since extension features have been removed. |
-`-----------------------------------------------------------------------------*/
+/*------------------------------------------------------------------.
+| Parse a double quoted parameter. It was used for |
+| %{source,header}_extension. For the moment, It is not used since |
+| extension features have been removed. |
+`------------------------------------------------------------------*/
#if 0
static void
read_declarations (void)
{
- int c;
- int tok;
-
for (;;)
{
- c = skip_white_space ();
+ int c = skip_white_space ();
if (c == '%')
{
- tok = parse_percent_token ();
+ token_t tok = parse_percent_token ();
switch (tok)
{
case tok_noop:
break;
+ case tok_stropt:
+ case tok_intopt:
+ case tok_obsolete:
+ abort ();
+ break;
+
+ case tok_illegal:
default:
complain (_("unrecognized: %s"), token_buffer);
skip_to_char ('%');
case '@':
copy_at (finput, &action_obstack,
- stack_offset);
+ rule, stack_offset);
break;
case EOF:
}
}
- obstack_sgrow (&action_obstack, ";\n break;}");
+ /* As a Bison extension, add the ending semicolon. Since some Yacc
+ don't do that, help people using bison as a Yacc finding their
+ missing semicolons. */
+ if (yacc_flag)
+ obstack_sgrow (&action_obstack, "}\n break;");
+ else
+ obstack_sgrow (&action_obstack, ";\n break;}");
}
\f
/*-------------------------------------------------------------------.
break;
case '@':
- copy_at (finput, &guard_obstack, stack_offset);
+ copy_at (finput, &guard_obstack, rule, stack_offset);
break;
case EOF:
}
\f
-static void
-record_rule_line (void)
-{
- /* Record each rule's source line number in rline table. */
-
- if (nrules >= rline_allocated)
- {
- rline_allocated = nrules * 2;
- rline = XREALLOC (rline, short, rline_allocated);
- }
- rline[nrules] = lineno;
-}
-
-
/*-------------------------------------------------------------------.
| Generate a dummy symbol, a nonterminal, whose name cannot conflict |
| with the user's names. |
nrules++;
nitems++;
- record_rule_line ();
-
- p = XCALLOC (symbol_list, 1);
- p->sym = lhs;
+ p = symbol_list_new (lhs);
crule1 = p1;
if (p1)
non-terminal. */
if (action_flag)
{
- bucket *sdummy;
-
/* Since the action was written out with this rule's
number, we must give the new rule this number by
inserting the new rule before it. */
/* Make a dummy nonterminal, a gensym. */
- sdummy = gensym ();
+ bucket *sdummy = gensym ();
- /* Make a new rule, whose body is empty,
- before the current one, so that the action
- just read can belong to it. */
+ /* Make a new rule, whose body is empty, before the
+ current one, so that the action just read can
+ belong to it. */
nrules++;
nitems++;
- record_rule_line ();
- p = XCALLOC (symbol_list, 1);
+ p = symbol_list_new (sdummy);
+ /* Attach its lineno to that of the host rule. */
+ p->line = crule->line;
if (crule1)
crule1->next = p;
else
grammar = p;
- p->sym = sdummy;
- crule1 = XCALLOC (symbol_list, 1);
- p->next = crule1;
+ /* End of the rule. */
+ crule1 = symbol_list_new (NULL);
crule1->next = crule;
+ p->next = crule1;
+
/* Insert the dummy generated by that rule into this
rule. */
nitems++;
- p = XCALLOC (symbol_list, 1);
- p->sym = sdummy;
+ p = symbol_list_new (sdummy);
p1->next = p;
p1 = p;
if (t == tok_identifier)
{
nitems++;
- p = XCALLOC (symbol_list, 1);
- p->sym = symval;
+ p = symbol_list_new (symval);
p1->next = p;
p1 = p;
}
} /* end of read rhs of rule */
/* Put an empty link in the list to mark the end of this rule */
- p = XCALLOC (symbol_list, 1);
+ p = symbol_list_new (NULL);
p1->next = p;
p1 = p;
}
+/*--------------------.
+| Output the header. |
+`--------------------*/
+
+static void
+symbols_output (void)
+{
+ if (defines_flag)
+ {
+ output_token_defines (&defines_obstack);
+
+ if (!pure_parser)
+ {
+ if (spec_name_prefix)
+ obstack_fgrow1 (&defines_obstack, "\nextern YYSTYPE %slval;\n",
+ spec_name_prefix);
+ else
+ obstack_sgrow (&defines_obstack,
+ "\nextern YYSTYPE yylval;\n");
+ }
+
+ if (semantic_parser)
+ {
+ int i;
+
+ for (i = ntokens; i < nsyms; i++)
+ {
+ /* don't make these for dummy nonterminals made by gensym. */
+ if (*tags[i] != '@')
+ obstack_fgrow2 (&defines_obstack,
+ "# define\tNT%s\t%d\n", tags[i], i);
+ }
+#if 0
+ /* `fdefines' is now a temporary file, so we need to copy its
+ contents in `done', so we can't close it here. */
+ fclose (fdefines);
+ fdefines = NULL;
+#endif
+ }
+ }
+}
+
+
+/*------------------------------------------------------------------.
+| Set TOKEN_TRANSLATIONS. Check that no two symbols share the same |
+| number. |
+`------------------------------------------------------------------*/
+
+static void
+token_translations_init (void)
+{
+ bucket *bp = NULL;
+ int i;
+
+ token_translations = XCALLOC (short, max_user_token_number + 1);
+
+ /* Initialize all entries for literal tokens to 2, the internal
+ token number for $undefined., which represents all invalid
+ inputs. */
+ for (i = 0; i <= max_user_token_number; i++)
+ token_translations[i] = 2;
+
+ for (bp = firstsymbol; bp; bp = bp->next)
+ {
+ /* Non-terminal? */
+ if (bp->value >= ntokens)
+ continue;
+ /* A token string alias? */
+ if (bp->user_token_number == SALIAS)
+ continue;
+
+ assert (bp->user_token_number != SUNDEF);
+
+ /* A token which translation has already been set? */
+ if (token_translations[bp->user_token_number] != 2)
+ complain (_("tokens %s and %s both assigned number %d"),
+ tags[token_translations[bp->user_token_number]],
+ bp->tag, bp->user_token_number);
+ token_translations[bp->user_token_number] = bp->value;
+ }
+}
+
+
/*------------------------------------------------------------------.
| Assign symbol numbers, and write definition of token names into |
| FDEFINES. Set up vectors TAGS and SPREC of names and precedences |
{
bucket *bp = NULL;
int tokno = 1;
- int i, j;
int last_user_token_number;
static char DOLLAR[] = "$";
- /* int lossage = 0; JF set but not used */
-
tags = XCALLOC (char *, nsyms + 1);
- tags[0] = DOLLAR;
user_toknums = XCALLOC (short, nsyms + 1);
- user_toknums[0] = 0;
sprec = XCALLOC (short, nsyms);
sassoc = XCALLOC (short, nsyms);
+ /* The EOF token. */
+ tags[0] = DOLLAR;
+ user_toknums[0] = 0;
+
max_user_token_number = 256;
last_user_token_number = 256;
if (bp->class == token_sym)
{
- if (!bp->user_token_number)
+ if (bp->user_token_number == SUNDEF)
bp->user_token_number = ++last_user_token_number;
if (bp->user_token_number > max_user_token_number)
max_user_token_number = bp->user_token_number;
sassoc[bp->value] = bp->assoc;
}
- token_translations = XCALLOC (short, max_user_token_number + 1);
-
- /* initialize all entries for literal tokens to 2, the internal
- token number for $undefined., which represents all invalid
- inputs. */
- for (j = 0; j <= max_user_token_number; j++)
- token_translations[j] = 2;
-
- for (bp = firstsymbol; bp; bp = bp->next)
- {
- if (bp->value >= ntokens)
- continue; /* non-terminal */
- if (bp->user_token_number == SALIAS)
- continue;
- if (token_translations[bp->user_token_number] != 2)
- complain (_("tokens %s and %s both assigned number %d"),
- tags[token_translations[bp->user_token_number]],
- bp->tag, bp->user_token_number);
- token_translations[bp->user_token_number] = bp->value;
- }
+ token_translations_init ();
error_token_number = errtoken->value;
fatal (_("the start symbol %s is a token"), startval->tag);
start_symbol = startval->value;
-
- if (defines_flag)
- {
- output_token_defines (&defines_obstack);
-
- if (!pure_parser)
- {
- if (spec_name_prefix)
- obstack_fgrow1 (&defines_obstack, "\nextern YYSTYPE %slval;\n",
- spec_name_prefix);
- else
- obstack_sgrow (&defines_obstack,
- "\nextern YYSTYPE yylval;\n");
- }
-
- if (semantic_parser)
- for (i = ntokens; i < nsyms; i++)
- {
- /* don't make these for dummy nonterminals made by gensym. */
- if (*tags[i] != '@')
- obstack_fgrow2 (&defines_obstack,
- "# define\tNT%s\t%d\n", tags[i], i);
- }
-#if 0
- /* `fdefines' is now a temporary file, so we need to copy its
- contents in `done', so we can't close it here. */
- fclose (fdefines);
- fdefines = NULL;
-#endif
- }
}
int ruleno;
symbol_list *p;
- bucket *ruleprec;
-
ritem = XCALLOC (short, nitems + 1);
- rlhs = XCALLOC (short, nrules) - 1;
- rrhs = XCALLOC (short, nrules) - 1;
- rprec = XCALLOC (short, nrules) - 1;
- rprecsym = XCALLOC (short, nrules) - 1;
- rassoc = XCALLOC (short, nrules) - 1;
+ rule_table = XCALLOC (rule_t, nrules) - 1;
itemno = 0;
ruleno = 1;
p = grammar;
while (p)
{
- rlhs[ruleno] = p->sym->value;
- rrhs[ruleno] = itemno;
- ruleprec = p->ruleprec;
+ bucket *ruleprec = p->ruleprec;
+ rule_table[ruleno].lhs = p->sym->value;
+ rule_table[ruleno].rhs = itemno;
+ rule_table[ruleno].line = p->line;
+ rule_table[ruleno].useful = TRUE;
p = p->next;
while (p && p->sym)
of the last token in it. */
if (p->sym->class == token_sym)
{
- rprec[ruleno] = p->sym->prec;
- rassoc[ruleno] = p->sym->assoc;
+ rule_table[ruleno].prec = p->sym->prec;
+ rule_table[ruleno].assoc = p->sym->assoc;
}
if (p)
p = p->next;
the specified symbol's precedence replaces the default. */
if (ruleprec)
{
- rprec[ruleno] = ruleprec->prec;
- rassoc[ruleno] = ruleprec->assoc;
- rprecsym[ruleno] = ruleprec->value;
+ rule_table[ruleno].prec = ruleprec->prec;
+ rule_table[ruleno].assoc = ruleprec->assoc;
+ rule_table[ruleno].precsym = ruleprec->value;
}
ritem[itemno++] = -ruleno;
}
ritem[itemno] = 0;
+
+ if (trace_flag)
+ ritem_print (stderr);
}
\f
/*-------------------------------------------------------------------.
nvars = 0;
nrules = 0;
nitems = 0;
- rline_allocated = 10;
- rline = XCALLOC (short, rline_allocated);
typed = 0;
lastprec = 0;
grammar = NULL;
- init_lex ();
+ lex_init ();
lineno = 1;
/* Initialize the symbol table. */
/* Read the declaration section. Copy %{ ... %} groups to
TABLE_OBSTACK and FDEFINES file. Also notice any %token, %left,
etc. found there. */
- obstack_1grow (&table_obstack, '\n');
obstack_fgrow3 (&table_obstack, "\
/* %s, made from %s\n\
by GNU bison %s. */\n\
packsymbols ();
/* Convert the grammar into the format described in gram.h. */
packgram ();
- /* Free the symbol table data structure since symbols are now all
- referred to by symbol number. */
- free_symtab ();
+ /* Output the headers. */
+ symbols_output ();
}
projects / bison.git / blobdiff