X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/0b8afb77232cbc73af84bff12306b86e4e098f31..a0ed1cb86a8d690cc41f757a8664dd54800c6d86:/src/reader.c diff --git a/src/reader.c b/src/reader.c index 7e23c0ef..49e5158e 100644 --- a/src/reader.c +++ b/src/reader.c @@ -34,6 +34,7 @@ #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; @@ -156,11 +157,12 @@ get_type_name (int n, symbol_list * rule) `------------------------------------------------------------*/ 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); @@ -192,9 +194,30 @@ copy_string (FILE *fin, struct obstack *oout, int match) 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 | @@ -403,9 +426,11 @@ copy_definition (void) /* -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; @@ -724,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'); @@ -874,6 +900,59 @@ parse_thong_decl (void) 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. | `------------------------------------------*/ @@ -981,6 +1060,14 @@ read_declarations (void) parse_source_extension_decl (); break; + case tok_define: + parse_macro_decl (); + break; + + case tok_skel: + parse_skel_decl (); + break; + case tok_noop: break; @@ -1025,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, '{'); @@ -1113,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; @@ -1564,22 +1653,6 @@ readgram (void) 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. */ - 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"); - } - /* Report any undefined symbols and consider them nonterminals. */ for (bp = firstsymbol; bp; bp = bp->next) @@ -1594,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 | @@ -1640,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'); } @@ -1660,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); @@ -1763,8 +1851,14 @@ packsymbols (void) 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 (&table_obstack); +#endif if (startval->class == unknown_sym) fatal (_("the start symbol %s is undefined"), startval->tag); @@ -1911,12 +2005,17 @@ reader (void) 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."); @@ -1926,30 +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'); - 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. */ - 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 0 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"); +#endif /* Assign the symbols their symbol numbers. Write #defines for the token symbols into FDEFINES if requested. */ packsymbols (); @@ -1959,30 +2046,3 @@ reader (void) 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"); -}