X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/b6610515d520cfefa5e2ead46538b823e7bd21c2..4134cae3c5ff2fc3346ebc5b10d5c25c72c72cfe:/src/reader.c diff --git a/src/reader.c b/src/reader.c index cc8f90a0..49e5158e 100644 --- a/src/reader.c +++ b/src/reader.c @@ -749,7 +749,8 @@ parse_union_decl (void) if (!no_lines_flag) obstack_fgrow2 (&attrs_obstack, "\n#line %d %s\n", - lineno, quotearg_style (c_quoting_style, infile)); + lineno, quotearg_style (c_quoting_style, + macro_find("filename"))); else obstack_1grow (&attrs_obstack, '\n'); @@ -907,9 +908,6 @@ parse_macro_decl (void) int ch = ungetc (skip_white_space (), finput); char* macro_key; char* macro_value; - struct obstack macro_obstack; - - obstack_init (¯o_obstack); /* Read key. */ if (!isalpha (ch) && ch != '_') @@ -919,6 +917,7 @@ parse_macro_decl (void) return; } copy_identifier (finput, ¯o_obstack); + obstack_1grow (¯o_obstack, 0); macro_key = obstack_finish (¯o_obstack); /* Read value. */ @@ -935,15 +934,25 @@ parse_macro_decl (void) else fatal (_("Premature EOF after %s"), "\""); } - copy_string (finput, ¯o_obstack, '"'); + copy_string2 (finput, ¯o_obstack, '"', 0); + obstack_1grow (¯o_obstack, 0); macro_value = obstack_finish (¯o_obstack); - obstack_free (¯o_obstack, 0); - /* 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. | `------------------------------------------*/ @@ -1054,6 +1063,10 @@ read_declarations (void) case tok_define: parse_macro_decl (); break; + + case tok_skel: + parse_skel_decl (); + break; case tok_noop: break; @@ -1099,7 +1112,8 @@ copy_action (symbol_list *rule, int stack_offset) if (!no_lines_flag) { sprintf (buf, "#line %d %s\n", - lineno, quotearg_style (c_quoting_style, infile)); + lineno, quotearg_style (c_quoting_style, + macro_find ("filename"))); obstack_grow (&action_obstack, buf, strlen (buf)); } obstack_1grow (&action_obstack, '{'); @@ -1187,7 +1201,8 @@ copy_guard (symbol_list *rule, int stack_offset) 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)); + lineno, quotearg_style (c_quoting_style, + macro_find ("filename"))); obstack_1grow (&guard_obstack, '{'); count = 0; @@ -1638,24 +1653,6 @@ readgram (void) 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) @@ -1670,6 +1667,25 @@ readgram (void) 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)); +} + /*--------------------------------------------------------------. | For named tokens, but not literal ones, define the name. The | @@ -1716,8 +1732,6 @@ output_token_defines (struct obstack *oout) if (semantic_parser) obstack_fgrow2 (oout, "# define\tT%s\t%d\n", symbol, bp->value); } - - /* obstack_1grow (oout, '\n'); */ } @@ -1736,8 +1750,6 @@ packsymbols (void) 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); @@ -1843,8 +1855,10 @@ packsymbols (void) obstack_1grow (&output_obstack, 0); macro_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); @@ -1991,6 +2005,9 @@ reader (void) init_lex (); lineno = 1; + /* Initialize the macro obstack. */ + obstack_init (¯o_obstack); + /* Initialize the symbol table. */ tabinit (); @@ -2008,22 +2025,18 @@ reader (void) /* 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'); */ - 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 (defines_flag) - reader_output_yylsp (&defines_obstack); */ - /* Write closing delimiters for actions and guards. */ - /* output_trailers (); */ - /* if (locations_flag) - obstack_sgrow (&table_obstack, "#define YYLSP_NEEDED 1\n\n"); */ +#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 ();