#include "files.h"
#include "xalloc.h"
#include "symtab.h"
+#include "options.h"
#include "lex.h"
#include "gram.h"
#include "complain.h"
#include "output.h"
#include "reader.h"
#include "conflicts.h"
-#include "macrotab.h"
+#include "muscle_tab.h"
/* Number of slots allocated (but not necessarily used yet) in `rline' */
static int rline_allocated;
#if 0
if (!no_lines_flag)
- obstack_fgrow2 (&attrs_obstack, "#line %d %s\n",
- lineno, quotearg_style (c_quoting_style, infile));
+ {
+ obstack_fgrow2 (&attrs_obstack, muscle_find ("linef"),
+ lineno, quotearg_style (c_quoting_style,
+ muscle_find("filename")));
+ }
#endif
after_percent = 0;
typed = 1;
+
if (!no_lines_flag)
- obstack_fgrow2 (&attrs_obstack, "\n#line %d %s\n",
- lineno, quotearg_style (c_quoting_style, infile));
+ {
+ obstack_fgrow2 (&attrs_obstack, muscle_find ("linef"),
+ lineno, quotearg_style (c_quoting_style,
+ muscle_find("filename")));
+ }
else
obstack_1grow (&attrs_obstack, '\n');
-
+
obstack_sgrow (&attrs_obstack, "typedef union");
if (defines_flag)
obstack_sgrow (&defines_obstack, "typedef union");
/* FIXME. */
static void
-parse_macro_decl (void)
+parse_muscle_decl (void)
{
int ch = ungetc (skip_white_space (), finput);
- char* macro_key;
- char* macro_value;
+ char* muscle_key;
+ char* muscle_value;
/* Read key. */
if (!isalpha (ch) && ch != '_')
skip_to_char ('%');
return;
}
- copy_identifier (finput, ¯o_obstack);
- obstack_1grow (¯o_obstack, 0);
- macro_key = obstack_finish (¯o_obstack);
+ copy_identifier (finput, &muscle_obstack);
+ obstack_1grow (&muscle_obstack, 0);
+ muscle_key = obstack_finish (&muscle_obstack);
/* Read value. */
ch = skip_white_space ();
else
fatal (_("Premature EOF after %s"), "\"");
}
- copy_string2 (finput, ¯o_obstack, '"', 0);
- obstack_1grow (¯o_obstack, 0);
- macro_value = obstack_finish (¯o_obstack);
+ copy_string2 (finput, &muscle_obstack, '"', 0);
+ obstack_1grow (&muscle_obstack, 0);
+ muscle_value = obstack_finish (&muscle_obstack);
/* Store the (key, value) pair in the environment. */
- macro_insert (macro_key, macro_value);
+ muscle_insert (muscle_key, muscle_value);
+}
+
+
+/*----------------------------------.
+| Parse what comes after %skeleton. |
+`----------------------------------*/
+
+void
+parse_skel_decl (void)
+{
+ /* Complete with parse_dquoted_param () on the CVS branch 1.29. */
}
/*------------------------------------------.
break;
case tok_define:
- parse_macro_decl ();
+ parse_muscle_decl ();
+ break;
+
+ case tok_skel:
+ parse_skel_decl ();
break;
case tok_noop:
if (semantic_parser)
stack_offset = 0;
- sprintf (buf, "\ncase %d:\n", nrules);
- obstack_grow (&action_obstack, buf, strlen (buf));
+ obstack_fgrow1 (&action_obstack, "\ncase %d:\n", nrules);
if (!no_lines_flag)
{
- sprintf (buf, "#line %d %s\n",
- lineno, quotearg_style (c_quoting_style, infile));
- obstack_grow (&action_obstack, buf, strlen (buf));
+ obstack_fgrow2 (&action_obstack, muscle_find ("linef"),
+ lineno, quotearg_style (c_quoting_style,
+ muscle_find ("filename")));
}
obstack_1grow (&action_obstack, '{');
obstack_fgrow1 (&guard_obstack, "\ncase %d:\n", nrules);
if (!no_lines_flag)
- obstack_fgrow2 (&guard_obstack, "#line %d %s\n",
- lineno, quotearg_style (c_quoting_style, infile));
+ obstack_fgrow2 (&guard_obstack, muscle_find ("linef"),
+ lineno, quotearg_style (c_quoting_style,
+ muscle_find ("filename")));
obstack_1grow (&guard_obstack, '{');
count = 0;
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)
- {
- /* 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. */
- obstack_sgrow (&attrs_obstack,
- "#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");
- }
-#endif
-
/* Report any undefined symbols and consider them nonterminals. */
for (bp = firstsymbol; bp; bp = bp->next)
}
/* At the end of the grammar file, some C source code must
- be stored. It is going to be associated to the user_code
+ be stored. It is going to be associated to the epilogue
directive. */
static void
read_additionnal_code (void)
{
char c;
- struct obstack uc_obstack;
+ struct obstack el_obstack;
- obstack_init (&uc_obstack);
+ obstack_init (&el_obstack);
while ((c = getc (finput)) != EOF)
- obstack_1grow (&uc_obstack, c);
+ obstack_1grow (&el_obstack, c);
- obstack_1grow (&uc_obstack, 0);
- macro_insert ("user_code", obstack_finish (&uc_obstack));
+ obstack_1grow (&el_obstack, 0);
+ muscle_insert ("epilogue", obstack_finish (&el_obstack));
}
\f
if (semantic_parser)
obstack_fgrow2 (oout, "# define\tT%s\t%d\n", symbol, bp->value);
}
-
- /* obstack_1grow (oout, '\n'); */
}
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);
output_token_defines (&output_obstack);
obstack_1grow (&output_obstack, 0);
- macro_insert ("tokendef", obstack_finish (&output_obstack));
+ muscle_insert ("tokendef", obstack_finish (&output_obstack));
- /* if (!no_parser_flag)
- output_token_defines (&table_obstack); */
+#if 0
+ if (!no_parser_flag)
+ output_token_defines (&table_obstack);
+#endif
if (startval->class == unknown_sym)
fatal (_("the start symbol %s is undefined"), startval->tag);
init_lex ();
lineno = 1;
- /* Initialize the macro obstack. */
- obstack_init (¯o_obstack);
+ /* Initialize the muscle obstack. */
+ obstack_init (&muscle_obstack);
/* Initialize the symbol table. */
tabinit ();
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. */
-#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. */
-#if 0
- output_trailers ();
- if (locations_flag)
- obstack_sgrow (&table_obstack, "#define YYLSP_NEEDED 1\n\n");
-#endif
+ write its type into the .tab.h file.
+ This is no longer need with header skeleton. */
+
/* Assign the symbols their symbol numbers. Write #defines for the
token symbols into FDEFINES if requested. */
packsymbols ();
projects / bison.git / blobdiff