X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/ceed8467b7db3615d3c9bfa9f3e5525d54c6a161..f1320c03a45fa90929d750b2d0b472633f4f3cda:/src/output.c diff --git a/src/output.c b/src/output.c index 3eea41ed..b23ffe8e 100644 --- a/src/output.c +++ b/src/output.c @@ -19,147 +19,92 @@ 02111-1307, USA. */ -/* functions to output parsing data to various files. Entries are: +/* The parser tables consist of these tables. + Starred ones needed only for the semantic parser. + Double starred are output only if switches are set. - output_headers () + yytranslate = vector mapping yylex's token numbers into bison's token + numbers. -Output constant strings to the beginning of certain files. + ** yytname = vector of string-names indexed by bison token number - output_trailers() + ** yytoknum = vector of yylex token numbers corresponding to entries + in yytname -Output constant strings to the ends of certain files. + yyrline = vector of line-numbers of all rules. For yydebug printouts. - output () + yyrhs = vector of items of all rules. + This is exactly what ritems contains. For yydebug and for semantic + parser. -Output the parsing tables and the parser code to ftable. + yyprhs[r] = index in yyrhs of first item for rule r. -The parser tables consist of these tables. -Starred ones needed only for the semantic parser. -Double starred are output only if switches are set. + yyr1[r] = symbol number of symbol that rule r derives. -yytranslate = vector mapping yylex's token numbers into bison's token numbers. + yyr2[r] = number of symbols composing right hand side of rule r. -** yytname = vector of string-names indexed by bison token number + * yystos[s] = the symbol number of the symbol that leads to state s. -** yytoknum = vector of yylex token numbers corresponding to entries in yytname + yydefact[s] = default rule to reduce with in state s, + when yytable doesn't specify something else to do. + Zero means the default is an error. -yyrline = vector of line-numbers of all rules. For yydebug printouts. + yydefgoto[i] = default state to go to after a reduction of a rule that + generates variable ntokens + i, except when yytable + specifies something else to do. -yyrhs = vector of items of all rules. - This is exactly what ritems contains. For yydebug and for semantic - parser. + yypact[s] = index in yytable of the portion describing state s. + The lookahead token's type is used to index that portion + to find out what to do. -yyprhs[r] = index in yyrhs of first item for rule r. + If the value in yytable is positive, + we shift the token and go to that state. -yyr1[r] = symbol number of symbol that rule r derives. + If the value is negative, it is minus a rule number to reduce by. -yyr2[r] = number of symbols composing right hand side of rule r. + If the value is zero, the default action from yydefact[s] is used. -* yystos[s] = the symbol number of the symbol that leads to state s. + yypgoto[i] = the index in yytable of the portion describing + what to do after reducing a rule that derives variable i + ntokens. + This portion is indexed by the parser state number, s, + as of before the text for this nonterminal was read. + The value from yytable is the state to go to if + the corresponding value in yycheck is s. -yydefact[s] = default rule to reduce with in state s, - when yytable doesn't specify something else to do. - Zero means the default is an error. + yytable = a vector filled with portions for different uses, + found via yypact and yypgoto. -yydefgoto[i] = default state to go to after a reduction of a rule that - generates variable ntokens + i, except when yytable - specifies something else to do. + yycheck = a vector indexed in parallel with yytable. + It indicates, in a roundabout way, the bounds of the + portion you are trying to examine. -yypact[s] = index in yytable of the portion describing state s. - The lookahead token's type is used to index that portion - to find out what to do. - - If the value in yytable is positive, - we shift the token and go to that state. - - If the value is negative, it is minus a rule number to reduce by. - - If the value is zero, the default action from yydefact[s] is used. - -yypgoto[i] = the index in yytable of the portion describing - what to do after reducing a rule that derives variable i + ntokens. - This portion is indexed by the parser state number, s, - as of before the text for this nonterminal was read. - The value from yytable is the state to go to if - the corresponding value in yycheck is s. - -yytable = a vector filled with portions for different uses, - found via yypact and yypgoto. - -yycheck = a vector indexed in parallel with yytable. - It indicates, in a roundabout way, the bounds of the - portion you are trying to examine. - - Suppose that the portion of yytable starts at index p - and the index to be examined within the portion is i. - Then if yycheck[p+i] != i, i is outside the bounds - of what is actually allocated, and the default - (from yydefact or yydefgoto) should be used. - Otherwise, yytable[p+i] should be used. - -YYFINAL = the state number of the termination state. -YYFLAG = most negative short int. Used to flag ?? -YYNTBASE = ntokens. + Suppose that the portion of yytable starts at index p + and the index to be examined within the portion is i. + Then if yycheck[p+i] != i, i is outside the bounds + of what is actually allocated, and the default + (from yydefact or yydefgoto) should be used. + Otherwise, yytable[p+i] should be used. + YYFINAL = the state number of the termination state. + YYFLAG = most negative short int. Used to flag ?? + YYNTBASE = ntokens. */ #include "system.h" #include "getargs.h" -#include "alloc.h" +#include "xalloc.h" #include "files.h" #include "gram.h" -#include "state.h" +#include "LR0.h" #include "complain.h" +#include "output.h" +#include "lalr.h" +#include "reader.h" +#include "conflicts.h" + +extern void berror PARAMS((const char *)); -extern char **tags; -extern int *user_toknums; -extern int tokensetsize; -extern int final_state; -extern core **state_table; -extern shifts **shift_table; -extern errs **err_table; -extern reductions **reduction_table; -extern short *accessing_symbol; -extern unsigned *LA; -extern short *LAruleno; -extern short *lookaheads; -extern char *consistent; -extern short *goto_map; -extern short *from_state; -extern short *to_state; - -extern void output_headers PARAMS ((void)); -extern void output_trailers PARAMS ((void)); -extern void output PARAMS ((void)); - -static void output_token_translations PARAMS ((void)); -static void output_gram PARAMS ((void)); -static void output_stos PARAMS ((void)); -static void output_rule_data PARAMS ((void)); -static void output_defines PARAMS ((void)); -static void output_actions PARAMS ((void)); -static void token_actions PARAMS ((void)); -static void save_row PARAMS ((int)); -static void goto_actions PARAMS ((void)); -static void save_column PARAMS ((int, int)); -static void sort_actions PARAMS ((void)); -static void pack_table PARAMS ((void)); -static void output_base PARAMS ((void)); -static void output_table PARAMS ((void)); -static void output_check PARAMS ((void)); -static void output_parser PARAMS ((void)); -static void output_program PARAMS ((void)); -static void free_shifts PARAMS ((void)); -static void free_reductions PARAMS ((void)); -static void free_itemsets PARAMS ((void)); -static int action_row PARAMS ((int)); -static int default_goto PARAMS ((int)); -static int matching_state PARAMS ((int)); -static int pack_vector PARAMS ((int)); - -extern void berror PARAMS ((const char *)); -extern void reader_output_yylsp PARAMS ((FILE *)); static int nvectors; static int nentries; @@ -179,6 +124,63 @@ static int high; +static inline void +output_short_or_char_table (FILE *out, + const char *comment, + const char *type, + const char *table_name, + short *short_table, + short first_value, + short begin, short end) +{ + int i, j; + + if (comment) + fprintf (out, "/* %s. */\n", comment); + + fprintf (out, "static const %s %s[] =\n{\n %6d", + type, table_name, first_value); + + j = 1; + for (i = begin; i < end; i++) + { + putc (',', out); + + if (j >= 10) + { + fputs ("\n ", out); + j = 1; + } + else + { + j++; + } + + fprintf (out, "%6d", short_table[i]); + } + + fprintf (out, "\n};\n"); +} + + +static inline void +output_short_table (FILE *out, + const char *comment, + const char *table_name, + short *short_table, + short first_value, + short begin, short end) +{ + output_short_or_char_table (out, comment, "short", table_name, short_table, + first_value, begin, end); +} + + +/*--------------------------------------------------------------. +| output_headers -- Output constant strings to the beginning of | +| certain files. | +`--------------------------------------------------------------*/ + #define GUARDSTR \ "\n\ #include \"%s\"\n\ @@ -214,14 +216,13 @@ register YYLTYPE *yylsp;\n\ #define ACTSTR_SIMPLE "\n switch (yyn) {\n" - void output_headers (void) { if (semantic_parser) fprintf (fguard, GUARDSTR, attrsfile); - if (noparserflag) + if (no_parser_flag) return; fprintf (faction, (semantic_parser ? ACTSTR : ACTSTR_SIMPLE), attrsfile); @@ -244,6 +245,10 @@ output_headers (void) } +/*-------------------------------------------------------. +| Output constant strings to the ends of certain files. | +`-------------------------------------------------------*/ + void output_trailers (void) { @@ -252,7 +257,7 @@ output_trailers (void) fprintf (faction, "\n"); - if (noparserflag) + if (no_parser_flag) return; if (semantic_parser) @@ -261,96 +266,27 @@ output_trailers (void) } -void -output (void) -{ - int c; - - /* output_token_defines(ftable); / * JF put out token defines FIRST */ - if (!semantic_parser) /* JF Put out other stuff */ - { - rewind (fattrs); - while ((c = getc (fattrs)) != EOF) - putc (c, ftable); - } - reader_output_yylsp (ftable); - if (debugflag) - fputs ("\ -#ifndef YYDEBUG\n\ -#define YYDEBUG 1\n\ -#endif\n\ -\n", - ftable); - - if (semantic_parser) - fprintf (ftable, "#include \"%s\"\n", attrsfile); - - if (!noparserflag) - fprintf (ftable, "#include \n\n"); - - /* Make "const" do nothing if not in ANSI C. */ - fputs ("\ -#ifndef __cplusplus\n\ -# ifndef __STDC__\n\ -# define const\n\ -# endif\n\ -#endif\n\ -\n", - ftable); - - free_itemsets (); - output_defines (); - output_token_translations (); -/* if (semantic_parser) */ - /* This is now unconditional because debugging printouts can use it. */ - output_gram (); - FREE (ritem); - if (semantic_parser) - output_stos (); - output_rule_data (); - output_actions (); - if (!noparserflag) - output_parser (); - output_program (); -} - static void output_token_translations (void) { - register int i, j; -/* register short *sp; JF unused */ - + fputs ("\ +\n\ +/* YYRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */\n", + ftable); if (translations) { fprintf (ftable, - "\n#define YYTRANSLATE(x) ((unsigned)(x) <= %d ? yytranslate[x] : %d)\n", + "#define YYTRANSLATE(x) ((unsigned)(x) <= %d ? yytranslate[x] : %d)\ +\n\ +\n", max_user_token_number, nsyms); - if (ntokens < 127) /* play it very safe; check maximum element value. */ - fprintf (ftable, "\nstatic const char yytranslate[] = { 0"); - else - fprintf (ftable, "\nstatic const short yytranslate[] = { 0"); - - j = 10; - for (i = 1; i <= max_user_token_number; i++) - { - putc (',', ftable); - - if (j >= 10) - { - putc ('\n', ftable); - j = 1; - } - else - { - j++; - } - - fprintf (ftable, "%6d", token_translations[i]); - } - - fprintf (ftable, "\n};\n"); + output_short_or_char_table (ftable, + "YYRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX", + ntokens < 127 ? "char" : "short", + "yytranslate", token_translations, + 0, 1, max_user_token_number + 1); } else { @@ -362,64 +298,33 @@ output_token_translations (void) static void output_gram (void) { - register int i; - register int j; - register short *sp; - /* With the ordinary parser, yyprhs and yyrhs are needed only for yydebug. */ - /* With the noparser option, all tables are generated */ - if (!semantic_parser && !noparserflag) - fprintf (ftable, "\n#if YYDEBUG != 0"); - - fprintf (ftable, "\nstatic const short yyprhs[] = { 0"); - - j = 10; - for (i = 1; i <= nrules; i++) - { - putc (',', ftable); - - if (j >= 10) - { - putc ('\n', ftable); - j = 1; - } - else - { - j++; - } - - fprintf (ftable, "%6d", rrhs[i]); - } - - fprintf (ftable, "\n};\n"); + /* With the no_parser option, all tables are generated */ + if (!semantic_parser && !no_parser_flag) + fprintf (ftable, "\n#if YYDEBUG != 0\n"); - fprintf (ftable, "\nstatic const short yyrhs[] = {%6d", ritem[0]); + output_short_table (ftable, NULL, "yyprhs", rrhs, + 0, 1, nrules + 1); - j = 10; - for (sp = ritem + 1; *sp; sp++) - { - putc (',', ftable); + { + size_t yyrhs_size = 1; + short *yyrhs, *sp; + int i; - if (j >= 10) - { - putc ('\n', ftable); - j = 1; - } - else - { - j++; - } + for (sp = ritem + 1; *sp; sp++) + ++yyrhs_size; + yyrhs = XMALLOC (short, yyrhs_size); - if (*sp > 0) - fprintf (ftable, "%6d", *sp); - else - fprintf (ftable, " 0"); - } + for (sp = ritem + 1, i = 1; *sp; ++sp, ++i) + yyrhs[i] = *sp > 0 ? *sp : 0; - fprintf (ftable, "\n};\n"); + output_short_table (ftable, NULL, "yyrhs", yyrhs, + ritem[0], 1, yyrhs_size); + XFREE (yyrhs); + } - if (!semantic_parser && !noparserflag) + if (!semantic_parser && !no_parser_flag) fprintf (ftable, "\n#endif\n"); } @@ -427,64 +332,30 @@ output_gram (void) static void output_stos (void) { - register int i; - register int j; - - fprintf (ftable, "\nstatic const short yystos[] = { 0"); - - j = 10; - for (i = 1; i < nstates; i++) - { - putc (',', ftable); - - if (j >= 10) - { - putc ('\n', ftable); - j = 1; - } - else - { - j++; - } - - fprintf (ftable, "%6d", accessing_symbol[i]); - } - - fprintf (ftable, "\n};\n"); + output_short_table (ftable, NULL, "yystos", accessing_symbol, + 0, 1, nstates); } static void output_rule_data (void) { - register int i; - register int j; + int i; + int j; + short *short_tab = NULL; fputs ("\n\ -#if YYDEBUG != 0\n\ -/* YYRLINE[yyn]: source line where rule number YYN was defined. */\n\ -static const short yyrline[] = { 0", ftable); - - j = 10; - for (i = 1; i <= nrules; i++) - { - putc (',', ftable); +#if YYDEBUG != 0\n", + ftable); - if (j >= 10) - { - putc ('\n', ftable); - j = 1; - } - else - { - j++; - } + output_short_table (ftable, + "YYRLINE[YYN] -- source line where rule number YYN was defined", + "yyrline", rline, + 0, 1, nrules + 1); - fprintf (ftable, "%6d", rline[i]); - } - fprintf (ftable, "\n};\n#endif\n\n"); + fputs ("#endif\n\n", ftable); - if (toknumflag || noparserflag) + if (token_table_flag || no_parser_flag) { fprintf (ftable, "#define YYNTOKENS %d\n", ntokens); fprintf (ftable, "#define YYNNTS %d\n", nvars); @@ -493,150 +364,110 @@ static const short yyrline[] = { 0", ftable); fprintf (ftable, "#define YYMAXUTOK %d\n\n", max_user_token_number); } - if (!toknumflag && !noparserflag) - fprintf (ftable, "\n#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)\n\n"); - /* Output the table of symbol names. */ - + if (!token_table_flag && !no_parser_flag) + fputs ("\n#if YYDEBUG != 0 || defined YYERROR_VERBOSE\n\n", ftable); + fputs ("\ +/* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */\n", + ftable); fprintf (ftable, - "static const char * const yytname[] = { \"%s\"", tags[0]); + "static const char *const yytname[] =\n{\n "); - j = strlen (tags[0]) + 44; - for (i = 1; i < nsyms; i++) + j = 0; + for (i = 0; i < nsyms; i++) /* this used to be i<=nsyms, but that output a final "" symbol almost by accident */ { - register char *p; - putc (',', ftable); - j++; + /* Width of the next token, including the two quotes, the coma + and the space. */ + int strsize = 4; + char *p; - if (j > 75) + for (p = tags[i]; p && *p; p++) + if (*p == '"' || *p == '\\' || *p == '\n' || *p == '\t' + || *p == '\b') + strsize += 2; + else if (*p < 040 || *p >= 0177) + strsize += 4; + else + strsize++; + + if (j + strsize > 75) { - putc ('\n', ftable); - j = 0; + fputs ("\n ", ftable); + j = 2; } putc ('\"', ftable); - j++; - for (p = tags[i]; p && *p; p++) { if (*p == '"' || *p == '\\') { fprintf (ftable, "\\%c", *p); - j += 2; } else if (*p == '\n') { fprintf (ftable, "\\n"); - j += 2; } else if (*p == '\t') { fprintf (ftable, "\\t"); - j += 2; } else if (*p == '\b') { fprintf (ftable, "\\b"); - j += 2; } else if (*p < 040 || *p >= 0177) { fprintf (ftable, "\\%03o", *p); - j += 4; } else { putc (*p, ftable); - j++; } } - putc ('\"', ftable); - j++; + fputs ("\", ", ftable); + j += strsize; } /* add a NULL entry to list of tokens */ - fprintf (ftable, ", NULL\n};\n"); + fprintf (ftable, "NULL\n};\n"); - if (!toknumflag && !noparserflag) + if (!token_table_flag && !no_parser_flag) fprintf (ftable, "#endif\n\n"); /* Output YYTOKNUM. */ - if (toknumflag) + if (token_table_flag) { - fprintf (ftable, "static const short yytoknum[] = { 0"); - j = 10; - for (i = 1; i <= ntokens; i++) - { - putc (',', ftable); - if (j >= 10) - { - putc ('\n', ftable); - j = 1; - } - else - j++; - fprintf (ftable, "%6d", user_toknums[i]); - } - fprintf (ftable, "\n};\n\n"); + output_short_table (ftable, + "YYTOKNUM[YYLEX] -- Index in YYTNAME corresponding to YYLEX", + "yytoknum", user_toknums, + 0, 1, ntokens + 1); } /* Output YYR1. */ - fputs ("\ -/* YYR1[YYN]: Symbol number of symbol that rule YYN derives. */\n\ -static const short yyr1[] = { 0", ftable); - - j = 10; - for (i = 1; i <= nrules; i++) - { - putc (',', ftable); - - if (j >= 10) - { - putc ('\n', ftable); - j = 1; - } - else - { - j++; - } + output_short_table (ftable, + "YYR1[YYN] -- Symbol number of symbol that rule YYN derives", + "yyr1", rlhs, + 0, 1, nrules + 1); + XFREE (rlhs + 1); - fprintf (ftable, "%6d", rlhs[i]); - } - FREE (rlhs + 1); - fputs ("\n\ -};\n\ -\n", ftable); + putc ('\n', ftable); /* Output YYR2. */ - fputs ("\ -/* YYR2[YYN]: Number of symbols composing right hand side of rule YYN. */\n\ -static const short yyr2[] = { 0", ftable); - j = 10; + short_tab = XMALLOC (short, nrules + 1); for (i = 1; i < nrules; i++) - { - putc (',', ftable); - - if (j >= 10) - { - putc ('\n', ftable); - j = 1; - } - else - { - j++; - } - - fprintf (ftable, "%6d", rrhs[i + 1] - rrhs[i] - 1); - } + short_tab[i] = rrhs[i + 1] - rrhs[i] - 1; + short_tab[nrules] = nitems - rrhs[nrules] - 1; + output_short_table (ftable, + "YYR2[YYN] -- Number of symbols composing right hand side of rule YYN", + "yyr2", short_tab, + 0, 1, nrules + 1); + putc ('\n', ftable); - putc (',', ftable); - if (j >= 10) - putc ('\n', ftable); + XFREE (short_tab); - fprintf (ftable, "%6d\n};\n", nitems - rrhs[nrules] - 1); - FREE (rrhs + 1); + XFREE (rrhs + 1); } @@ -649,118 +480,40 @@ output_defines (void) } - -/* compute and output yydefact, yydefgoto, yypact, yypgoto, yytable and yycheck. */ - -static void -output_actions (void) -{ - nvectors = nstates + nvars; - - froms = NEW2 (nvectors, short *); - tos = NEW2 (nvectors, short *); - tally = NEW2 (nvectors, short); - width = NEW2 (nvectors, short); - - token_actions (); - free_shifts (); - free_reductions (); - FREE (lookaheads); - FREE (LA); - FREE (LAruleno); - FREE (accessing_symbol); - - goto_actions (); - FREE (goto_map + ntokens); - FREE (from_state); - FREE (to_state); - - sort_actions (); - pack_table (); - output_base (); - output_table (); - output_check (); -} - - - -/* Figure out the actions for the specified state, indexed by - lookahead token type. - - The yydefact table is output now. The detailed info is saved for - putting into yytable later. */ - -static void -token_actions (void) -{ - register int i; - register int j; - register int k; - - actrow = NEW2 (ntokens, short); - - k = action_row (0); - fprintf (ftable, "\nstatic const short yydefact[] = {%6d", k); - save_row (0); - - j = 10; - for (i = 1; i < nstates; i++) - { - putc (',', ftable); - - if (j >= 10) - { - putc ('\n', ftable); - j = 1; - } - else - { - j++; - } - - k = action_row (i); - fprintf (ftable, "%6d", k); - save_row (i); - } - - fprintf (ftable, "\n};\n"); - FREE (actrow); -} - - - -/* Decide what to do for each type of token if seen as the lookahead - token in specified state. The value returned is used as the - default action (yydefact) for the state. In addition, actrow is - filled with what to do for each kind of token, index by symbol - number, with zero meaning do the default action. The value - MINSHORT, a very negative number, means this situation is an error. - The parser recognizes this value specially. - - This is where conflicts are resolved. The loop over lookahead - rules considered lower-numbered rules last, and the last rule - considered that likes a token gets to handle it. */ +/*------------------------------------------------------------------. +| Decide what to do for each type of token if seen as the lookahead | +| token in specified state. The value returned is used as the | +| default action (yydefact) for the state. In addition, actrow is | +| filled with what to do for each kind of token, index by symbol | +| number, with zero meaning do the default action. The value | +| MINSHORT, a very negative number, means this situation is an | +| error. The parser recognizes this value specially. | +| | +| This is where conflicts are resolved. The loop over lookahead | +| rules considered lower-numbered rules last, and the last rule | +| considered that likes a token gets to handle it. | +`------------------------------------------------------------------*/ static int action_row (int state) { - register int i; - register int j; - register int k; - register int m = 0; - register int n = 0; - register int count; - register int default_rule; - register int nreds; - register int max; - register int rule; - register int shift_state; - register int symbol; - register unsigned mask; - register unsigned *wordp; - register reductions *redp; - register shifts *shiftp; - register errs *errp; + int i; + int j; + int k; + int m = 0; + int n = 0; + int count; + int default_rule; + int nreds; + int max; + int rule; + int shift_state; + int symbol; + unsigned mask; + unsigned *wordp; + reductions *redp; + shifts *shiftp; + errs *errp; int nodefault = 0; /* set nonzero to inhibit having any default reduction */ for (i = 0; i < ntokens; i++) @@ -914,11 +667,11 @@ action_row (int state) static void save_row (int state) { - register int i; - register int count; - register short *sp; - register short *sp1; - register short *sp2; + int i; + int count; + short *sp; + short *sp1; + short *sp2; count = 0; for (i = 0; i < ntokens; i++) @@ -930,8 +683,8 @@ save_row (int state) if (count == 0) return; - froms[state] = sp1 = sp = NEW2 (count, short); - tos[state] = sp2 = NEW2 (count, short); + froms[state] = sp1 = sp = XCALLOC (short, count); + tos[state] = sp2 = XCALLOC (short, count); for (i = 0; i < ntokens; i++) { @@ -947,61 +700,119 @@ save_row (int state) } +/*------------------------------------------------------------------. +| Figure out the actions for the specified state, indexed by | +| lookahead token type. | +| | +| The YYDEFACT table is output now. The detailed info is saved for | +| putting into YYTABLE later. | +`------------------------------------------------------------------*/ + +static void +token_actions (void) +{ + int i; + short *yydefact = XCALLOC (short, nstates); -/* figure out what to do after reducing with each rule, - depending on the saved state from before the beginning - of parsing the data that matched this rule. + actrow = XCALLOC (short, ntokens); + for (i = 0; i < nstates; ++i) + { + yydefact[i] = action_row (i); + save_row (i); + } + XFREE (actrow); + + output_short_table (ftable, + "YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE\n\ + doesn't specify something else to do. Zero means the default is an\n\ + error", + "yydefact", yydefact, + yydefact[0], 1, nstates); + putc ('\n', ftable); + XFREE (yydefact); +} - The yydefgoto table is output now. The detailed info - is saved for putting into yytable later. */ static void -goto_actions (void) +free_shifts (void) { - register int i; - register int j; - register int k; + shifts *sp, *sptmp; /* JF derefrenced freed ptr */ - state_count = NEW2 (nstates, short); + XFREE (shift_table); - k = default_goto (ntokens); - fprintf (ftable, "\nstatic const short yydefgoto[] = {%6d", k); - save_column (ntokens, k); + for (sp = first_shift; sp; sp = sptmp) + { + sptmp = sp->next; + XFREE (sp); + } +} + + +static void +free_reductions (void) +{ + reductions *rp, *rptmp; /* JF fixed freed ptr */ + + XFREE (reduction_table); - j = 10; - for (i = ntokens + 1; i < nsyms; i++) + for (rp = first_reduction; rp; rp = rptmp) { - putc (',', ftable); + rptmp = rp->next; + XFREE (rp); + } +} - if (j >= 10) - { - putc ('\n', ftable); - j = 1; - } - else - { - j++; - } - k = default_goto (i); - fprintf (ftable, "%6d", k); - save_column (i, k); + +static void +save_column (int symbol, int default_state) +{ + int i; + short *sp; + short *sp1; + short *sp2; + int count; + int symno; + + short begin = goto_map[symbol]; + short end = goto_map[symbol + 1]; + + count = 0; + for (i = begin; i < end; i++) + { + if (to_state[i] != default_state) + count++; } - fprintf (ftable, "\n};\n"); - FREE (state_count); -} + if (count == 0) + return; + + symno = symbol - ntokens + nstates; + + froms[symno] = sp1 = sp = XCALLOC (short, count); + tos[symno] = sp2 = XCALLOC (short, count); + for (i = begin; i < end; i++) + { + if (to_state[i] != default_state) + { + *sp1++ = from_state[i]; + *sp2++ = to_state[i]; + } + } + tally[symno] = count; + width[symno] = sp1[-1] - sp[0] + 1; +} static int default_goto (int symbol) { - register int i; - register int m; - register int n; - register int default_state; - register int max; + int i; + int m; + int n; + int default_state; + int max; m = goto_map[symbol]; n = goto_map[symbol + 1]; @@ -1031,64 +842,51 @@ default_goto (int symbol) } +/*-------------------------------------------------------------------. +| Figure out what to do after reducing with each rule, depending on | +| the saved state from before the beginning of parsing the data that | +| matched this rule. | +| | +| The YYDEFGOTO table is output now. The detailed info is saved for | +| putting into YYTABLE later. | +`-------------------------------------------------------------------*/ + static void -save_column (int symbol, int default_state) +goto_actions (void) { - register int i; - register int m; - register int n; - register short *sp; - register short *sp1; - register short *sp2; - register int count; - register int symno; + int i; - m = goto_map[symbol]; - n = goto_map[symbol + 1]; + short *yydefgoto = XMALLOC (short, nsyms - ntokens); + state_count = XCALLOC (short, nstates); - count = 0; - for (i = m; i < n; i++) + for (i = ntokens; i < nsyms; ++i) { - if (to_state[i] != default_state) - count++; + int default_state = default_goto (i); + save_column (i, default_state); + yydefgoto[i - ntokens] = default_state; } - if (count == 0) - return; - - symno = symbol - ntokens + nstates; - - froms[symno] = sp1 = sp = NEW2 (count, short); - tos[symno] = sp2 = NEW2 (count, short); - - for (i = m; i < n; i++) - { - if (to_state[i] != default_state) - { - *sp1++ = from_state[i]; - *sp2++ = to_state[i]; - } - } + output_short_table (ftable, NULL, "yydefgoto", yydefgoto, + yydefgoto[0], 1, nsyms - ntokens); - tally[symno] = count; - width[symno] = sp1[-1] - sp[0] + 1; + XFREE (state_count); + XFREE (yydefgoto); } - /* The next few functions decide how to pack the actions and gotos information into yytable. */ static void sort_actions (void) { - register int i; - register int j; - register int k; - register int t; - register int w; + int i; + int j; + int k; + int t; + int w; - order = NEW2 (nvectors, short); + order = XCALLOC (short, nvectors); nentries = 0; for (i = 0; i < nvectors; i++) @@ -1115,65 +913,16 @@ sort_actions (void) } -static void -pack_table (void) -{ - register int i; - register int place; - register int state; - - base = NEW2 (nvectors, short); - pos = NEW2 (nentries, short); - table = NEW2 (MAXTABLE, short); - check = NEW2 (MAXTABLE, short); - - lowzero = 0; - high = 0; - - for (i = 0; i < nvectors; i++) - base[i] = MINSHORT; - - for (i = 0; i < MAXTABLE; i++) - check[i] = -1; - - for (i = 0; i < nentries; i++) - { - state = matching_state (i); - - if (state < 0) - place = pack_vector (i); - else - place = base[state]; - - pos[i] = place; - base[order[i]] = place; - } - - for (i = 0; i < nvectors; i++) - { - if (froms[i]) - FREE (froms[i]); - if (tos[i]) - FREE (tos[i]); - } - - FREE (froms); - FREE (tos); - FREE (pos); -} - - - static int matching_state (int vector) { - register int i; - register int j; - register int k; - register int t; - register int w; - register int match; - register int prev; + int i; + int j; + int k; + int t; + int w; + int match; + int prev; i = order[vector]; if (i >= nstates) @@ -1203,24 +952,22 @@ matching_state (int vector) } - static int pack_vector (int vector) { - register int i; - register int j; - register int k; - register int t; - register int loc = 0; - register int ok; - register short *from; - register short *to; + int i; + int j; + int k; + int t; + int loc = 0; + int ok; + short *from; + short *to; i = order[vector]; t = tally[i]; - if (t == 0) - berror ("pack_vector"); + assert (t); from = froms[i]; to = tos[i]; @@ -1269,132 +1016,131 @@ pack_vector (int vector) } - -/* the following functions output yytable, yycheck - and the vectors whose elements index the portion starts */ - static void -output_base (void) +pack_table (void) { - register int i; - register int j; + int i; + int place; + int state; - fprintf (ftable, "\nstatic const short yypact[] = {%6d", base[0]); - - j = 10; - for (i = 1; i < nstates; i++) - { - putc (',', ftable); + base = XCALLOC (short, nvectors); + pos = XCALLOC (short, nentries); + table = XCALLOC (short, MAXTABLE); + check = XCALLOC (short, MAXTABLE); - if (j >= 10) - { - putc ('\n', ftable); - j = 1; - } - else - { - j++; - } + lowzero = 0; + high = 0; - fprintf (ftable, "%6d", base[i]); - } + for (i = 0; i < nvectors; i++) + base[i] = MINSHORT; - fprintf (ftable, "\n};\n\nstatic const short yypgoto[] = {%6d", - base[nstates]); + for (i = 0; i < MAXTABLE; i++) + check[i] = -1; - j = 10; - for (i = nstates + 1; i < nvectors; i++) + for (i = 0; i < nentries; i++) { - putc (',', ftable); + state = matching_state (i); - if (j >= 10) - { - putc ('\n', ftable); - j = 1; - } + if (state < 0) + place = pack_vector (i); else - { - j++; - } + place = base[state]; + + pos[i] = place; + base[order[i]] = place; + } - fprintf (ftable, "%6d", base[i]); + for (i = 0; i < nvectors; i++) + { + if (froms[i]) + XFREE (froms[i]); + if (tos[i]) + XFREE (tos[i]); } - fprintf (ftable, "\n};\n"); - FREE (base); + XFREE (froms); + XFREE (tos); + XFREE (pos); } +/* the following functions output yytable, yycheck + and the vectors whose elements index the portion starts */ static void -output_table (void) +output_base (void) { - register int i; - register int j; + output_short_table (ftable, NULL, "yypact", base, + base[0], 1, nstates); - fprintf (ftable, "\n\n#define\tYYLAST\t\t%d\n\n", high); - fprintf (ftable, "\nstatic const short yytable[] = {%6d", table[0]); + putc ('\n', ftable); - j = 10; - for (i = 1; i <= high; i++) - { - putc (',', ftable); + output_short_table (ftable, NULL, "yypgoto", base, + base[nstates], nstates + 1, nvectors); - if (j >= 10) - { - putc ('\n', ftable); - j = 1; - } - else - { - j++; - } + XFREE (base); +} - fprintf (ftable, "%6d", table[i]); - } - fprintf (ftable, "\n};\n"); - FREE (table); +static void +output_table (void) +{ + fprintf (ftable, "\n\n#define\tYYLAST\t\t%d\n\n\n", high); + output_short_table (ftable, NULL, "yytable", table, + table[0], 1, high + 1); + XFREE (table); } static void output_check (void) { - register int i; - register int j; - - fprintf (ftable, "\nstatic const short yycheck[] = {%6d", check[0]); + output_short_table (ftable, NULL, "yycheck", check, + check[0], 1, high + 1); + XFREE (check); +} - j = 10; - for (i = 1; i <= high; i++) - { - putc (',', ftable); +/* compute and output yydefact, yydefgoto, yypact, yypgoto, yytable + and yycheck. */ - if (j >= 10) - { - putc ('\n', ftable); - j = 1; - } - else - { - j++; - } +static void +output_actions (void) +{ + nvectors = nstates + nvars; - fprintf (ftable, "%6d", check[i]); - } + froms = XCALLOC (short *, nvectors); + tos = XCALLOC (short *, nvectors); + tally = XCALLOC (short, nvectors); + width = XCALLOC (short, nvectors); - fprintf (ftable, "\n};\n"); - FREE (check); -} + token_actions (); + free_shifts (); + free_reductions (); + XFREE (lookaheads); + XFREE (LA); + XFREE (LAruleno); + XFREE (accessing_symbol); + goto_actions (); + XFREE (goto_map + ntokens); + XFREE (from_state); + XFREE (to_state); + sort_actions (); + pack_table (); + putc ('\n', ftable); + output_base (); + output_table (); + putc ('\n', ftable); + output_check (); +} /* copy the parser code into the ftable file at the end. */ static void output_parser (void) { - register int c; + int c; + static int number_of_dollar_signs = 0; #ifdef DONTDEF FILE *fpars; #else @@ -1404,8 +1150,9 @@ output_parser (void) if (pure_parser) fprintf (ftable, "#define YYPURE 1\n\n"); -#ifdef DONTDEF /* JF no longer needed 'cuz open_extra_files changes the - currently open parser from bison.simple to bison.hairy */ +#ifdef DONTDEF + /* JF no longer needed 'cuz open_extra_files changes the currently + open parser from bison.simple to bison.hairy */ if (semantic_parser) fpars = fparser; else @@ -1422,7 +1169,7 @@ output_parser (void) /* See if the line starts with `#line. If so, set write_line to 0. */ - if (nolinesflag) + if (no_lines_flag) if (c == '#') { c = getc (fpars); @@ -1456,11 +1203,15 @@ output_parser (void) { if (c == '$') { + number_of_dollar_signs++; + assert (number_of_dollar_signs == 1); /* `$' in the parser file indicates where to put the actions. Copy them in at this point. */ rewind (faction); for (c = getc (faction); c != EOF; c = getc (faction)) putc (c, ftable); + /* Skip the end of the line containing `$'. */ + write_line = 0; } else putc (c, ftable); @@ -1469,14 +1220,15 @@ output_parser (void) break; putc (c, ftable); } + assert (number_of_dollar_signs == 1); } static void output_program (void) { - register int c; + int c; - if (!nolinesflag) + if (!no_lines_flag) fprintf (ftable, "#line %d \"%s\"\n", lineno, infile); c = getc (finput); @@ -1491,43 +1243,71 @@ output_program (void) static void free_itemsets (void) { - register core *cp, *cptmp; + core *cp, *cptmp; - FREE (state_table); + XFREE (state_table); for (cp = first_state; cp; cp = cptmp) { cptmp = cp->next; - FREE (cp); + XFREE (cp); } } -static void -free_shifts (void) -{ - register shifts *sp, *sptmp; /* JF derefrenced freed ptr */ +/*----------------------------------------------------------. +| Output the parsing tables and the parser code to ftable. | +`----------------------------------------------------------*/ - FREE (shift_table); +void +output (void) +{ + int c; - for (sp = first_shift; sp; sp = sptmp) + /* output_token_defines(ftable); / * JF put out token defines FIRST */ + if (!semantic_parser) /* JF Put out other stuff */ { - sptmp = sp->next; - FREE (sp); + rewind (fattrs); + while ((c = getc (fattrs)) != EOF) + putc (c, ftable); } -} + reader_output_yylsp (ftable); + if (debug_flag) + fputs ("\ +#ifndef YYDEBUG\n\ +# define YYDEBUG 1\n\ +#endif\n\ +\n", + ftable); + if (semantic_parser) + fprintf (ftable, "#include \"%s\"\n", attrsfile); -static void -free_reductions (void) -{ - register reductions *rp, *rptmp; /* JF fixed freed ptr */ + if (!no_parser_flag) + fprintf (ftable, "#include \n\n"); - FREE (reduction_table); + /* Make "const" do nothing if not in ANSI C. */ + fputs ("\ +#ifndef __cplusplus\n\ +# ifndef __STDC__\n\ +# define const\n\ +# endif\n\ +#endif\n\ +\n", + ftable); - for (rp = first_reduction; rp; rp = rptmp) - { - rptmp = rp->next; - FREE (rp); - } + free_itemsets (); + output_defines (); + output_token_translations (); +/* if (semantic_parser) */ + /* This is now unconditional because debugging printouts can use it. */ + output_gram (); + XFREE (ritem); + if (semantic_parser) + output_stos (); + output_rule_data (); + output_actions (); + if (!no_parser_flag) + output_parser (); + output_program (); }