#include "output.h"
#include "reader.h"
#include "conflicts.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
`------------------------------------------------------------*/
static inline void
-copy_string (FILE *fin, struct obstack *oout, int match)
+copy_string2 (FILE *fin, struct obstack *oout, int match, int store)
{
int c;
- obstack_1grow (oout, match);
+ if (store)
+ obstack_1grow (oout, match);
c = getc (fin);
c = getc (fin);
}
- obstack_1grow (oout, c);
+ if (store)
+ obstack_1grow (oout, c);
}
+/* FIXME. */
+
+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 |
else if (isdigit (c) || c == '-')
{
int n;
- char buf[4096];
ungetc (c, fin);
n = read_signed_integer (fin);
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 == '<')
/* -1 while reading a character if prev char was %. */
int after_percent;
+#if 0
if (!no_lines_flag)
obstack_fgrow2 (&attrs_obstack, "#line %d %s\n",
lineno, quotearg_style (c_quoting_style, infile));
+#endif
after_percent = 0;
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 |
parse_assoc_decl (non_assoc);
break;
+ case tok_hdrext:
+ parse_header_extension_decl ();
+ break;
+
+ case tok_srcext:
+ parse_source_extension_decl ();
+ break;
+
+ case tok_define:
+ parse_macro_decl ();
+ break;
+
+ case tok_skel:
+ parse_skel_decl ();
+ break;
+
case tok_noop:
break;
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++;
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"));
+#if 0 /* This code is in the skeleton now. */
/* JF put out same default YYSTYPE as YACC does */
if (typed == 0
&& !value_components_used)
"#ifndef YYSTYPE\n#define YYSTYPE int\n#endif\n");
if (defines_flag)
obstack_sgrow (&defines_obstack, "\
-#ifndef YYSTYPE\n\
-# define YYSTYPE int\n\
-#endif\n");
+# ifndef YYSTYPE\n\
+# define YYSTYPE int\n\
+# endif\n");
}
+#endif
/* Report any undefined symbols and consider them nonterminals. */
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 user_code
+ directive. */
+static void
+read_additionnal_code (void)
+{
+ char c;
+ struct obstack uc_obstack;
+
+ obstack_init (&uc_obstack);
+
+ while ((c = getc (finput)) != EOF)
+ obstack_1grow (&uc_obstack, c);
+
+ obstack_1grow (&uc_obstack, 0);
+ macro_insert ("user_code", obstack_finish (&uc_obstack));
+}
+
\f
/*--------------------------------------------------------------.
| For named tokens, but not literal ones, define the name. The |
if (c != '\0')
continue;
- obstack_fgrow2 (oout, "#define\t%s\t%d\n",
+ obstack_fgrow2 (oout, "# define\t%s\t%d\n",
symbol,
- ((translations && !raw_flag)
- ? bp->user_token_number : bp->value));
+ (translations ? bp->user_token_number : bp->value));
if (semantic_parser)
- obstack_fgrow2 (oout, "#define\tT%s\t%d\n", symbol, bp->value);
+ obstack_fgrow2 (oout, "# define\tT%s\t%d\n", symbol, bp->value);
}
- obstack_1grow (oout, '\n');
+ /* obstack_1grow (oout, '\n'); */
}
error_token_number = errtoken->value;
- if (!no_parser_flag)
- output_token_defines (&table_obstack);
+ output_token_defines (&output_obstack);
+ obstack_1grow (&output_obstack, 0);
+ macro_insert ("tokendef", obstack_finish (&output_obstack));
+
+ /* if (!no_parser_flag)
+ output_token_defines (&table_obstack); */
if (startval->class == unknown_sym)
fatal (_("the start symbol %s is undefined"), startval->tag);
/* 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);
+ "# define\tNT%s\t%d\n", tags[i], i);
}
#if 0
/* `fdefines' is now a temporary file, so we need to copy its
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.");
/* 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\
-\n",
- no_parser_flag ? "Bison-generated parse tables" : "A Bison parser",
- infile, VERSION);
-
- obstack_sgrow (&table_obstack,
- "#define YYBISON 1 /* Identify Bison output. */\n\n");
read_declarations ();
/* Start writing the guard and action files, if they are needed. */
+#if 0
output_headers ();
+#endif
/* 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 0
if (defines_flag)
reader_output_yylsp (&defines_obstack);
+#endif
/* Write closing delimiters for actions and guards. */
- output_trailers ();
+#if 0
+ output_trailers ();
if (locations_flag)
obstack_sgrow (&table_obstack, "#define YYLSP_NEEDED 1\n\n");
+#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 ();
}
-
-
-/*------------------------------------------------------------------.
-| Define YYLTYPE. Cannot be in the skeleton since we might have to |
-| output it in the headers if --defines is used. |
-`------------------------------------------------------------------*/
-
-void
-reader_output_yylsp (struct obstack *oout)
-{
- if (locations_flag)
- obstack_sgrow (oout, "\
-\n\
-#ifndef YYLTYPE\n\
-typedef struct yyltype\n\
-{\n\
- int first_line;\n\
- int first_column;\n\
-\n\
- int last_line;\n\
- int last_column;\n\
-} yyltype;\n\
-\n\
-# define YYLTYPE yyltype\n\
-#endif\n\
-\n");
-}
projects / bison.git / blobdiff