#include "system.h"
#include "obstack.h"
+#include "quotearg.h"
+#include "quote.h"
#include "getargs.h"
#include "files.h"
#include "xalloc.h"
#include "output.h"
#include "reader.h"
#include "conflicts.h"
-#include "quote.h"
+#include "macrotab.h"
/* Number of slots allocated (but not necessarily used yet) in `rline' */
static int rline_allocated;
/* Incremented for each %left, %right or %nonassoc seen */
static int lastprec;
-/* Incremented for each generated symbol */
-static int gensym_count;
-
static bucket *errtoken;
static bucket *undeftoken;
\f
return rp->sym->type_name;
}
\f
-/*-----------------------------------------------------------------.
-| Dump the string from FIN to FOUT and OOUT if non null. MATCH is |
-| the delimiter of the string (either ' or "). |
-`-----------------------------------------------------------------*/
+/*------------------------------------------------------------.
+| Dump the string from FIN to OOUT if non null. MATCH is the |
+| delimiter of the string (either ' or "). |
+`------------------------------------------------------------*/
static inline void
-copy_string (FILE *fin, FILE *fout, struct obstack *oout, int match)
+copy_string2 (FILE *fin, struct obstack *oout, int match, int store)
{
int c;
- if (fout)
- putc (match, fout);
- if (oout)
+ if (store)
obstack_1grow (oout, match);
c = getc (fin);
continue;
}
- if (fout)
- putc (c, fout);
- if (oout)
- obstack_1grow (oout, c);
+ obstack_1grow (oout, c);
if (c == '\\')
{
c = getc (fin);
if (c == EOF)
fatal (_("unterminated string at end of file"));
- if (fout)
- putc (c, fout);
- if (oout)
- obstack_1grow (oout, c);
+ obstack_1grow (oout, c);
if (c == '\n')
lineno++;
c = getc (fin);
}
- if (fout)
- putc (c, fout);
- if (oout)
+ if (store)
obstack_1grow (oout, c);
}
+/* FIXME. */
-/*----------------------------------------------------------------.
-| Dump the wannabee comment from IN to OUT1 and OUT2. In fact we |
-| just saw a `/', which might or might not be a comment. In any |
-| case, copy what we saw. |
-| |
-| OUT2 might be NULL. |
-`----------------------------------------------------------------*/
+static inline void
+copy_string (FILE *fin, struct obstack *oout, int match)
+{
+ copy_string2 (fin, oout, match, 1);
+}
+
+/* FIXME. */
+
+static inline void
+copy_identifier (FILE *fin, struct obstack *oout)
+{
+ int c;
+
+ while (isalnum (c = getc (fin)) || c == '_')
+ obstack_1grow (oout, c);
+
+ ungetc (c, fin);
+}
+
+/*-----------------------------------------------------------------.
+| Dump the wannabee comment from IN to OUT1 and OUT2 (which can be |
+| NULL). In fact we just saw a `/', which might or might not be a |
+| comment. In any case, copy what we saw. |
+| |
+| OUT2 might be NULL. |
+`-----------------------------------------------------------------*/
static inline void
-copy_comment2 (FILE *fin, FILE *out1, FILE *out2, struct obstack *oout)
+copy_comment2 (FILE *fin, struct obstack *oout1, struct obstack *oout2)
{
int cplus_comment;
int ended;
int c;
/* We read a `/', output it. */
- if (out1)
- putc ('/', out1);
- if (out2)
- putc ('/', out2);
- if (oout)
- obstack_1grow (oout, '/');
+ obstack_1grow (oout1, '/');
+ if (oout2)
+ obstack_1grow (oout2, '/');
switch ((c = getc (fin)))
{
return;
}
- if (out1)
- putc (c, out1);
- if (out2)
- putc (c, out2);
- if (oout)
- obstack_1grow (oout, c);
+ obstack_1grow (oout1, c);
+ if (oout2)
+ obstack_1grow (oout2, c);
c = getc (fin);
ended = 0;
{
while (c == '*')
{
- if (out1)
- putc (c, out1);
- if (out2)
- putc (c, out2);
- if (oout)
- obstack_1grow (oout, c);
+ obstack_1grow (oout1, c);
+ if (oout2)
+ obstack_1grow (oout2, c);
c = getc (fin);
}
if (c == '/')
{
- if (out1)
- putc (c, out1);
- if (out2)
- putc (c, out2);
- if (oout)
- obstack_1grow (oout, c);
+ obstack_1grow (oout1, c);
+ if (oout2)
+ obstack_1grow (oout2, c);
ended = 1;
}
}
else if (c == '\n')
{
lineno++;
- if (out1)
- putc (c, out1);
- if (out2)
- putc (c, out2);
- if (oout)
- obstack_1grow (oout, c);
+ obstack_1grow (oout1, c);
+ if (oout2)
+ obstack_1grow (oout2, c);
if (cplus_comment)
ended = 1;
else
fatal (_("unterminated comment"));
else
{
- if (out1)
- putc (c, out1);
- if (out2)
- putc (c, out2);
- if (oout)
- obstack_1grow (oout, c);
+ obstack_1grow (oout1, c);
+ if (oout2)
+ obstack_1grow (oout2, c);
c = getc (fin);
}
}
/*-------------------------------------------------------------------.
| Dump the comment (actually the current string starting with a `/') |
-| from FIN to FOUT. |
+| from FIN to OOUT. |
`-------------------------------------------------------------------*/
static inline void
-copy_comment (FILE *fin, FILE *fout, struct obstack *oout)
+copy_comment (FILE *fin, struct obstack *oout)
{
- copy_comment2 (fin, fout, NULL, oout);
+ copy_comment2 (fin, oout, NULL);
}
/*-----------------------------------------------------------------.
-| FIN is pointing to a location (i.e., a `@'). Output to FOUT a |
+| 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 |
| respect to the top of the stack. |
`-----------------------------------------------------------------*/
static inline void
-copy_at (FILE *fin, FILE *fout, struct obstack *oout, int stack_offset)
+copy_at (FILE *fin, struct obstack *oout, int stack_offset)
{
int c;
c = getc (fin);
if (c == '$')
{
- if (fout)
- fprintf (fout, "yyloc");
- if (oout)
- obstack_grow_literal_string (oout, "yylloc");
+ obstack_sgrow (oout, "yyloc");
locations_flag = 1;
}
else if (isdigit (c) || c == '-')
{
int n;
- char buf[4096];
ungetc (c, fin);
n = read_signed_integer (fin);
- sprintf (buf, "yylsp[%d]", n - stack_offset);
- if (fout)
- fputs (buf, fout);
- if (oout)
- obstack_grow (oout, buf, strlen (buf));
+ obstack_fgrow1 (oout, "yylsp[%d]", n - stack_offset);
locations_flag = 1;
}
else
| |
| Possible inputs: $[<TYPENAME>]($|integer) |
| |
-| Output to FOUT a reference to this semantic value. STACK_OFFSET is |
+| Output to OOUT a reference to this semantic value. STACK_OFFSET is |
| the number of values in the current rule so far, which says where |
| to find `$0' with respect to the top of the stack. |
`-------------------------------------------------------------------*/
static inline void
-copy_dollar (FILE *fin, FILE *fout, struct obstack *oout,
+copy_dollar (FILE *fin, struct obstack *oout,
symbol_list *rule, int stack_offset)
{
int c = getc (fin);
- char *type_name = NULL;
+ const char *type_name = NULL;
/* Get the type name if explicit. */
if (c == '<')
if (c == '$')
{
- if (fout)
- fputs ("yyval", fout);
- if (oout)
- obstack_grow_literal_string (oout, "yyval");
+ obstack_sgrow (oout, "yyval");
if (!type_name)
type_name = get_type_name (0, rule);
if (type_name)
- {
- if (fout)
- fprintf (fout, ".%s", type_name);
- if (oout)
- obstack_fgrow1 (oout, ".%s", type_name);
- }
+ obstack_fgrow1 (oout, ".%s", type_name);
if (!type_name && typed)
complain (_("$$ of `%s' has no declared type"),
rule->sym->tag);
if (!type_name && n > 0)
type_name = get_type_name (n, rule);
- if (fout)
- fprintf (fout, "yyvsp[%d]", n - stack_offset);
- if (oout)
- obstack_fgrow1 (oout, "yyvsp[%d]", n - stack_offset);
+ obstack_fgrow1 (oout, "yyvsp[%d]", n - stack_offset);
if (type_name)
- {
- if (fout)
- fprintf (fout, ".%s", type_name);
- if (oout)
- obstack_fgrow1 (oout, ".%s", type_name);
- }
+ obstack_fgrow1 (oout, ".%s", type_name);
if (!type_name && typed)
complain (_("$%d of `%s' has no declared type"),
n, rule->sym->tag);
/* -1 while reading a character if prev char was %. */
int after_percent;
+#if 0
if (!no_lines_flag)
- fprintf (fattrs, "#line %d \"%s\"\n", lineno, infile);
+ obstack_fgrow2 (&attrs_obstack, "#line %d %s\n",
+ lineno, quotearg_style (c_quoting_style, infile));
+#endif
after_percent = 0;
switch (c)
{
case '\n':
- putc (c, fattrs);
+ obstack_1grow (&attrs_obstack, c);
lineno++;
break;
case '\'':
case '"':
- copy_string (finput, fattrs, 0, c);
+ copy_string (finput, &attrs_obstack, c);
break;
case '/':
- copy_comment (finput, fattrs, 0);
+ copy_comment (finput, &attrs_obstack);
break;
case EOF:
fatal ("%s", _("unterminated `%{' definition"));
default:
- putc (c, fattrs);
+ obstack_1grow (&attrs_obstack, c);
}
c = getc (finput);
{
if (c == '}')
return;
- putc ('%', fattrs);
+ obstack_1grow (&attrs_obstack, '%');
}
after_percent = 0;
-
}
-
}
static void
parse_token_decl (symbol_class what_is, symbol_class what_is_not)
{
- int token = 0;
+ token_t token = 0;
char *typename = 0;
/* The symbol being defined. */
fatal (_("Premature EOF after %s"), token_buffer);
token = lex ();
- if (token == COMMA)
+ if (token == tok_comma)
{
symbol = NULL;
continue;
}
- if (token == TYPENAME)
+ if (token == tok_typename)
{
typename = xstrdup (token_buffer);
value_components_used = 1;
symbol = NULL;
}
- else if (token == IDENTIFIER && *symval->tag == '\"' && symbol)
+ else if (token == tok_identifier && *symval->tag == '\"' && symbol)
{
if (symval->alias)
warn (_("symbol `%s' used more than once as a literal string"),
translations = 1;
symbol = NULL;
}
- else if (token == IDENTIFIER)
+ else if (token == tok_identifier)
{
int oldclass = symval->class;
symbol = symval;
complain (_("type redeclaration for %s"), symbol->tag);
}
}
- else if (symbol && token == NUMBER)
+ else if (symbol && token == tok_number)
{
symbol->user_token_number = numval;
translations = 1;
{
if (start_flag)
complain (_("multiple %s declarations"), "%start");
- if (lex () != IDENTIFIER)
+ if (lex () != tok_identifier)
complain (_("invalid %s declaration"), "%start");
else
{
{
char *name;
- if (lex () != TYPENAME)
+ if (lex () != tok_typename)
{
complain ("%s", _("%type declaration has no <typename>"));
skip_to_char ('%');
for (;;)
{
- int t;
+ token_t t;
int tmp_char = ungetc (skip_white_space (), finput);
if (tmp_char == '%')
switch (t)
{
- case COMMA:
- case SEMICOLON:
+ case tok_comma:
+ case tok_semicolon:
break;
- case IDENTIFIER:
+ case tok_identifier:
if (symval->type_name == NULL)
symval->type_name = name;
else if (strcmp (name, symval->type_name) != 0)
for (;;)
{
- int t;
+ token_t t;
int tmp_char = ungetc (skip_white_space (), finput);
if (tmp_char == '%')
switch (t)
{
- case TYPENAME:
+ case tok_typename:
name = xstrdup (token_buffer);
break;
- case COMMA:
+ case tok_comma:
break;
- case IDENTIFIER:
+ case tok_identifier:
if (symval->prec != 0)
complain (_("redefining precedence of %s"), symval->tag);
symval->prec = lastprec;
}
break;
- case NUMBER:
- if (prev == IDENTIFIER)
+ case tok_number:
+ if (prev == tok_identifier)
{
symval->user_token_number = numval;
translations = 1;
}
break;
- case SEMICOLON:
+ case tok_semicolon:
return;
default:
-/*-------------------------------------------------------------------.
-| Copy the union declaration into fattrs (and fdefines), where it is |
-| made into the definition of YYSTYPE, the type of elements of the |
-| parser value stack. |
-`-------------------------------------------------------------------*/
+/*--------------------------------------------------------------.
+| Copy the union declaration into ATTRS_OBSTACK (and fdefines), |
+| where it is made into the definition of YYSTYPE, the type of |
+| elements of the parser value stack. |
+`--------------------------------------------------------------*/
static void
parse_union_decl (void)
typed = 1;
if (!no_lines_flag)
- fprintf (fattrs, "\n#line %d \"%s\"\n", lineno, infile);
+ obstack_fgrow2 (&attrs_obstack, "\n#line %d %s\n",
+ lineno, quotearg_style (c_quoting_style, infile));
else
- fprintf (fattrs, "\n");
+ obstack_1grow (&attrs_obstack, '\n');
- fprintf (fattrs, "typedef union");
- if (fdefines)
- fprintf (fdefines, "typedef union");
+ obstack_sgrow (&attrs_obstack, "typedef union");
+ if (defines_flag)
+ obstack_sgrow (&defines_obstack, "typedef union");
c = getc (finput);
while (c != EOF)
{
- putc (c, fattrs);
- if (fdefines)
- putc (c, fdefines);
+ obstack_1grow (&attrs_obstack, c);
+ if (defines_flag)
+ obstack_1grow (&defines_obstack, c);
switch (c)
{
break;
case '/':
- copy_comment2 (finput, fattrs, fdefines, 0);
+ copy_comment2 (finput, &defines_obstack, &attrs_obstack);
break;
case '{':
count--;
if (count <= 0)
{
- fprintf (fattrs, " YYSTYPE;\n");
- if (fdefines)
- fprintf (fdefines, " YYSTYPE;\n");
+ obstack_sgrow (&attrs_obstack, " YYSTYPE;\n");
+ if (defines_flag)
+ obstack_sgrow (&defines_obstack, " YYSTYPE;\n");
/* JF don't choke on trailing semi */
c = skip_white_space ();
if (c != ';')
static void
parse_thong_decl (void)
{
- int token;
+ token_t token;
struct bucket *symbol;
char *typename = 0;
int usrtoknum;
translations = 1;
token = lex (); /* fetch typename or first token */
- if (token == TYPENAME)
+ if (token == tok_typename)
{
typename = xstrdup (token_buffer);
value_components_used = 1;
/* process first token */
- if (token != IDENTIFIER)
+ if (token != tok_identifier)
{
complain (_("unrecognized item %s, expected an identifier"),
token_buffer);
token = lex (); /* get number or literal string */
- if (token == NUMBER)
+ if (token == tok_number)
{
usrtoknum = numval;
token = lex (); /* okay, did number, now get literal */
/* process literal string token */
- if (token != IDENTIFIER || *symval->tag != '\"')
+ if (token != tok_identifier || *symval->tag != '\"')
{
complain (_("expected string constant instead of %s"), token_buffer);
skip_to_char ('%');
nsyms--;
}
+/* FIXME. */
+
+static void
+parse_macro_decl (void)
+{
+ int ch = ungetc (skip_white_space (), finput);
+ char* macro_key;
+ char* macro_value;
+
+ /* Read key. */
+ if (!isalpha (ch) && ch != '_')
+ {
+ complain (_("invalid %s declaration"), "%define");
+ skip_to_char ('%');
+ return;
+ }
+ copy_identifier (finput, ¯o_obstack);
+ obstack_1grow (¯o_obstack, 0);
+ macro_key = obstack_finish (¯o_obstack);
+
+ /* Read value. */
+ ch = skip_white_space ();
+ if (ch != '"')
+ {
+ ungetc (ch, finput);
+ if (ch != EOF)
+ {
+ complain (_("invalid %s declaration"), "%define");
+ skip_to_char ('%');
+ return;
+ }
+ else
+ fatal (_("Premature EOF after %s"), "\"");
+ }
+ copy_string2 (finput, ¯o_obstack, '"', 0);
+ obstack_1grow (¯o_obstack, 0);
+ macro_value = obstack_finish (¯o_obstack);
+
+ /* Store the (key, value) pair in the environment. */
+ macro_insert (macro_key, macro_value);
+}
+
+
+/*----------------------------------.
+| Parse what comes after %skeleton. |
+`----------------------------------*/
+
+void
+parse_skel_decl (void)
+{
+ /* Complete with parse_dquoted_param () on the CVS branch 1.29. */
+}
+
+/*------------------------------------------.
+| Parse what comes after %header_extension. |
+`------------------------------------------*/
+
+static void
+parse_header_extension_decl (void)
+{
+ char buff[32];
+
+ if (header_extension)
+ complain (_("multiple %%header_extension declarations"));
+ fscanf (finput, "%s", buff);
+ header_extension = xstrdup (buff);
+}
+
+/*------------------------------------------.
+| Parse what comes after %source_extension. |
+`------------------------------------------*/
+
+static void
+parse_source_extension_decl (void)
+{
+ char buff[32];
+
+ if (src_extension)
+ complain (_("multiple %%source_extension declarations"));
+ fscanf (finput, "%s", buff);
+ src_extension = xstrdup (buff);
+}
/*----------------------------------------------------------------.
| Read from finput until `%%' is seen. Discard the `%%'. Handle |
| any `%' declarations, and copy the contents of any `%{ ... %}' |
-| groups to fattrs. |
+| groups to ATTRS_OBSTACK. |
`----------------------------------------------------------------*/
static void
switch (tok)
{
- case TWO_PERCENTS:
+ case tok_two_percents:
return;
- case PERCENT_LEFT_CURLY:
+ case tok_percent_left_curly:
copy_definition ();
break;
- case TOKEN:
+ case tok_token:
parse_token_decl (token_sym, nterm_sym);
break;
- case NTERM:
+ case tok_nterm:
parse_token_decl (nterm_sym, token_sym);
break;
- case TYPE:
+ case tok_type:
parse_type_decl ();
break;
- case START:
+ case tok_start:
parse_start_decl ();
break;
- case UNION:
+ case tok_union:
parse_union_decl ();
break;
- case EXPECT:
+ case tok_expect:
parse_expect_decl ();
break;
- case THONG:
+
+ case tok_thong:
parse_thong_decl ();
break;
- case LEFT:
+ case tok_left:
parse_assoc_decl (left_assoc);
break;
- case RIGHT:
+ case tok_right:
parse_assoc_decl (right_assoc);
break;
- case NONASSOC:
+ case tok_nonassoc:
parse_assoc_decl (non_assoc);
break;
- case SEMANTIC_PARSER:
- if (semantic_parser == 0)
- {
- semantic_parser = 1;
- open_extra_files ();
- }
+ case tok_hdrext:
+ parse_header_extension_decl ();
break;
- case PURE_PARSER:
- pure_parser = 1;
+ case tok_srcext:
+ parse_source_extension_decl ();
break;
- case NOOP:
+ case tok_define:
+ parse_macro_decl ();
+ break;
+
+ case tok_skel:
+ parse_skel_decl ();
+ break;
+
+ case tok_noop:
break;
default:
if (!no_lines_flag)
{
- sprintf (buf, "#line %d \"%s\"\n", lineno, infile);
+ sprintf (buf, "#line %d %s\n",
+ lineno, quotearg_style (c_quoting_style, infile));
obstack_grow (&action_obstack, buf, strlen (buf));
}
obstack_1grow (&action_obstack, '{');
case '\'':
case '"':
- copy_string (finput, 0, &action_obstack, c);
+ copy_string (finput, &action_obstack, c);
break;
case '/':
- copy_comment (finput, 0, &action_obstack);
+ copy_comment (finput, &action_obstack);
break;
case '$':
- copy_dollar (finput, 0, &action_obstack,
+ copy_dollar (finput, &action_obstack,
rule, stack_offset);
break;
case '@':
- copy_at (finput, 0, &action_obstack,
+ copy_at (finput, &action_obstack,
stack_offset);
break;
}
}
- obstack_grow_literal_string (&action_obstack,
- ";\n break;}");
+ obstack_sgrow (&action_obstack, ";\n break;}");
}
\f
/*-------------------------------------------------------------------.
if (semantic_parser)
stack_offset = 0;
- fprintf (fguard, "\ncase %d:\n", nrules);
+ obstack_fgrow1 (&guard_obstack, "\ncase %d:\n", nrules);
if (!no_lines_flag)
- fprintf (fguard, "#line %d \"%s\"\n", lineno, infile);
- putc ('{', fguard);
+ obstack_fgrow2 (&guard_obstack, "#line %d %s\n",
+ lineno, quotearg_style (c_quoting_style, infile));
+ obstack_1grow (&guard_obstack, '{');
count = 0;
c = getc (finput);
switch (c)
{
case '\n':
- putc (c, fguard);
+ obstack_1grow (&guard_obstack, c);
lineno++;
break;
case '{':
- putc (c, fguard);
+ obstack_1grow (&guard_obstack, c);
brace_flag = 1;
count++;
break;
case '}':
- putc (c, fguard);
+ obstack_1grow (&guard_obstack, c);
if (count > 0)
count--;
else
case '\'':
case '"':
- copy_string (finput, fguard, 0, c);
+ copy_string (finput, &guard_obstack, c);
break;
case '/':
- copy_comment (finput, fguard, 0);
+ copy_comment (finput, &guard_obstack);
break;
case '$':
- copy_dollar (finput, fguard, 0, rule, stack_offset);
+ copy_dollar (finput, &guard_obstack, rule, stack_offset);
break;
case '@':
- copy_at (finput, fguard, 0, stack_offset);
+ copy_at (finput, &guard_obstack, stack_offset);
break;
case EOF:
fatal ("%s", _("unterminated %guard clause"));
default:
- putc (c, fguard);
+ obstack_1grow (&guard_obstack, c);
}
if (c != '}' || count != 0)
c = skip_white_space ();
- fprintf (fguard, ";\n break;}");
+ obstack_sgrow (&guard_obstack, ";\n break;}");
if (c == '{')
copy_action (rule, stack_offset);
else if (c == '=')
static bucket *
gensym (void)
{
+ /* Incremented for each generated symbol */
+ static int gensym_count = 0;
+ static char buf[256];
+
bucket *sym;
- sprintf (token_buffer, "@%d", ++gensym_count);
+ sprintf (buf, "@%d", ++gensym_count);
+ token_buffer = buf;
sym = getsym (token_buffer);
sym->class = nterm_sym;
sym->value = nvars++;
get_type (void)
{
int k;
- int t;
+ token_t token;
char *name;
- t = lex ();
+ token = lex ();
- if (t != TYPENAME)
+ if (token != tok_typename)
{
complain (_("invalid %s declaration"), "%type");
return t;
for (;;)
{
- t = lex ();
+ token = lex ();
- switch (t)
+ switch (token)
{
- case SEMICOLON:
+ case tok_semicolon:
return lex ();
- case COMMA:
+ case tok_comma:
break;
- case IDENTIFIER:
+ case tok_identifier:
if (symval->type_name == NULL)
symval->type_name = name;
else if (strcmp (name, symval->type_name) != 0)
break;
default:
- return t;
+ return token;
}
}
}
static void
readgram (void)
{
- int t;
+ token_t t;
bucket *lhs = NULL;
symbol_list *p;
symbol_list *p1;
t = lex ();
- while (t != TWO_PERCENTS && t != ENDFILE)
+ while (t != tok_two_percents && t != tok_eof)
{
- if (t == IDENTIFIER || t == BAR)
+ if (t == tok_identifier || t == tok_bar)
{
int action_flag = 0;
/* Number of symbols in rhs of this rule so far */
int xactions = 0; /* JF for error checking */
bucket *first_rhs = 0;
- if (t == IDENTIFIER)
+ if (t == tok_identifier)
{
lhs = symval;
}
t = lex ();
- if (t != COLON)
+ if (t != tok_colon)
{
complain (_("ill-formed rule: initial symbol not followed by colon"));
unlex (t);
}
}
- if (nrules == 0 && t == BAR)
+ if (nrules == 0 && t == tok_bar)
{
complain (_("grammar starts with vertical bar"));
lhs = symval; /* BOGUS: use a random symval */
for (;;)
{
t = lex ();
- if (t == PREC)
+ if (t == tok_prec)
{
t = lex ();
crule->ruleprec = symval;
t = lex ();
}
- if (!(t == IDENTIFIER || t == LEFT_CURLY))
+ if (!(t == tok_identifier || t == tok_left_curly))
break;
/* If next token is an identifier, see if a colon follows it.
If one does, exit this rule now. */
- if (t == IDENTIFIER)
+ if (t == tok_identifier)
{
bucket *ssave;
- int t1;
+ token_t t1;
ssave = symval;
t1 = lex ();
unlex (t1);
symval = ssave;
- if (t1 == COLON)
+ if (t1 == tok_colon)
break;
if (!first_rhs) /* JF */
action_flag = 0;
}
- if (t == IDENTIFIER)
+ if (t == tok_identifier)
{
nitems++;
p = XCALLOC (symbol_list, 1);
p1->next = p;
p1 = p;
- if (t == PREC)
+ if (t == tok_prec)
{
complain (_("two @prec's in a row"));
t = lex ();
crule->ruleprec = symval;
t = lex ();
}
- if (t == GUARD)
+ if (t == tok_guard)
{
if (!semantic_parser)
complain (_("%%guard present but %%semantic_parser not specified"));
copy_guard (crule, rulelength);
t = lex ();
}
- else if (t == LEFT_CURLY)
+ else if (t == tok_left_curly)
{
/* This case never occurs -wjh */
if (action_flag)
/* Warn if there is no default for $$ but we need one. */
else if (!xactions && !first_rhs && lhs->type_name != 0)
complain (_("empty rule for typed nonterminal, and no action"));
- if (t == SEMICOLON)
+ if (t == tok_semicolon)
t = lex ();
}
#if 0
b) most of them scan forward until finding a next %
thus they may swallow lots of intervening rules
*/
- else if (t == TOKEN)
+ else if (t == tok_token)
{
parse_token_decl (token_sym, nterm_sym);
t = lex ();
}
- else if (t == NTERM)
+ else if (t == tok_nterm)
{
parse_token_decl (nterm_sym, token_sym);
t = lex ();
}
- else if (t == TYPE)
+ else if (t == tok_type)
{
t = get_type ();
}
- else if (t == UNION)
+ else if (t == tok_union)
{
parse_union_decl ();
t = lex ();
}
- else if (t == EXPECT)
+ else if (t == tok_expect)
{
parse_expect_decl ();
t = lex ();
}
- else if (t == START)
+ else if (t == tok_start)
{
parse_start_decl ();
t = lex ();
else
{
- complain (_("invalid input: %s"), token_buffer);
+ complain (_("invalid input: %s"), quote (token_buffer));
t = lex ();
}
}
if (nrules == 0)
fatal (_("no rules in the input grammar"));
- /* JF put out same default YYSTYPE as YACC does */
- if (typed == 0
- && !value_components_used)
- {
- /* We used to use `unsigned long' as YYSTYPE on MSDOS,
- but it seems better to be consistent.
- Most programs should declare their own type anyway. */
- fprintf (fattrs, "#ifndef YYSTYPE\n#define YYSTYPE int\n#endif\n");
- if (fdefines)
- fprintf (fdefines, "#ifndef YYSTYPE\n#define YYSTYPE int\n#endif\n");
- }
-
/* Report any undefined symbols and consider them nonterminals. */
for (bp = firstsymbol; bp; bp = bp->next)
ntokens = nsyms - nvars;
}
+
+/* At the end of the grammar file, some C source code must
+ be stored. It is going to be associated to the epilogue
+ directive. */
+static void
+read_additionnal_code (void)
+{
+ char c;
+ struct obstack el_obstack;
+
+ obstack_init (&el_obstack);
+
+ while ((c = getc (finput)) != EOF)
+ obstack_1grow (&el_obstack, c);
+
+ obstack_1grow (&el_obstack, 0);
+ macro_insert ("epilogue", obstack_finish (&el_obstack));
+}
+
\f
/*--------------------------------------------------------------.
| For named tokens, but not literal ones, define the name. The |
`--------------------------------------------------------------*/
static void
-output_token_defines (FILE *file)
+output_token_defines (struct obstack *oout)
{
bucket *bp;
char *cp, *symbol;
if (c != '\0')
continue;
- fprintf (file, "#define\t%s\t%d\n", symbol,
- ((translations && !raw_flag)
- ? bp->user_token_number : bp->value));
+ obstack_fgrow2 (oout, "# define\t%s\t%d\n",
+ symbol,
+ (translations ? bp->user_token_number : bp->value));
if (semantic_parser)
- fprintf (file, "#define\tT%s\t%d\n", symbol, bp->value);
+ obstack_fgrow2 (oout, "# define\tT%s\t%d\n", symbol, bp->value);
}
-
- putc ('\n', file);
}
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);
error_token_number = errtoken->value;
+ output_token_defines (&output_obstack);
+ obstack_1grow (&output_obstack, 0);
+ macro_insert ("tokendef", obstack_finish (&output_obstack));
+
+#if 0
if (!no_parser_flag)
- output_token_defines (ftable);
+ output_token_defines (&table_obstack);
+#endif
if (startval->class == unknown_sym)
fatal (_("the start symbol %s is undefined"), startval->tag);
if (defines_flag)
{
- output_token_defines (fdefines);
+ output_token_defines (&defines_obstack);
if (!pure_parser)
{
if (spec_name_prefix)
- fprintf (fdefines, "\nextern YYSTYPE %slval;\n",
- spec_name_prefix);
+ obstack_fgrow1 (&defines_obstack, "\nextern YYSTYPE %slval;\n",
+ spec_name_prefix);
else
- fprintf (fdefines, "\nextern YYSTYPE yylval;\n");
+ obstack_sgrow (&defines_obstack,
+ "\nextern YYSTYPE yylval;\n");
}
if (semantic_parser)
{
/* don't make these for dummy nonterminals made by gensym. */
if (*tags[i] != '@')
- fprintf (fdefines, "#define\tNT%s\t%d\n", tags[i], 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
\f
/*-------------------------------------------------------------------.
| Read in the grammar specification and record it in the format |
-| described in gram.h. All guards are copied into the FGUARD file |
+| described in gram.h. All guards are copied into the GUARD_OBSTACK |
| and all actions into ACTION_OBSTACK, in each case forming the body |
| of a C function (YYGUARD or YYACTION) which contains a switch |
| statement to decide which guard or action to execute. |
typed = 0;
lastprec = 0;
- gensym_count = 0;
-
semantic_parser = 0;
pure_parser = 0;
init_lex ();
lineno = 1;
+ /* Initialize the macro obstack. */
+ obstack_init (¯o_obstack);
+
/* Initialize the symbol table. */
tabinit ();
+
/* Construct the error token */
errtoken = getsym ("error");
errtoken->class = token_sym;
errtoken->user_token_number = 256; /* Value specified by POSIX. */
+
/* Construct a token that represents all undefined literal tokens.
It is always token number 2. */
undeftoken = getsym ("$undefined.");
undeftoken->class = token_sym;
undeftoken->user_token_number = 2;
- /* Read the declaration section. Copy %{ ... %} groups to FTABLE
- and FDEFINES file. Also notice any %token, %left, etc. found
- there. */
- putc ('\n', ftable);
- fprintf (ftable, "\
-/* %s, made from %s\n\
- by GNU bison %s. */\n\
-\n", no_parser_flag ? "Bison-generated parse tables" : "A Bison parser", infile, VERSION);
-
- fputs ("#define YYBISON 1 /* Identify Bison output. */\n\n", ftable);
+ /* Read the declaration section. Copy %{ ... %} groups to
+ TABLE_OBSTACK and FDEFINES file. Also notice any %token, %left,
+ etc. found there. */
read_declarations ();
- /* Start writing the guard and action files, if they are needed. */
- output_headers ();
/* Read in the grammar, build grammar in list form. Write out
guards and actions. */
readgram ();
+ /* Some C code is given at the end of the grammar file. */
+ read_additionnal_code ();
/* Now we know whether we need the line-number stack. If we do,
write its type into the .tab.h file. */
- if (fdefines)
- reader_output_yylsp (fdefines);
- /* Write closing delimiters for actions and guards. */
- output_trailers ();
- if (locations_flag)
- fputs ("#define YYLSP_NEEDED\n\n", ftable);
+#if 0
+ if (defines_flag)
+ reader_output_yylsp (&defines_obstack);
+#endif
/* Assign the symbols their symbol numbers. Write #defines for the
token symbols into FDEFINES if requested. */
packsymbols ();
referred to by symbol number. */
free_symtab ();
}
-
-
-void
-reader_output_yylsp (FILE *f)
-{
- if (locations_flag)
- fputs ("\
-\n\
-#ifndef YYLTYPE\n\
-typedef struct yyltype\n\
-{\n\
- int timestamp;\n\
- int first_line;\n\
- int first_column;\
-\n\
- int last_line;\n\
- int last_column;\n\
- char *text;\n\
-} yyltype;\n\
-\n\
-# define YYLTYPE yyltype\n\
-#endif\n\
-\n",
- f);
-}
projects / bison.git / blobdiff