X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/bd02036a4e579ac2d43edb966e66297ad5e32310..e91ff6ce3d2653b41265591dafd4bdb32ae114c2:/src/reader.c?ds=sidebyside diff --git a/src/reader.c b/src/reader.c index db168b68..6a99cfff 100644 --- a/src/reader.c +++ b/src/reader.c @@ -199,13 +199,13 @@ symbol_pack (symbol_t *this) /* This symbol and its alias are a single token defn. Allocate a tokno, and assign to both check agreement of prec and assoc fields and make both the same */ - if (this->number == -1) + if (this->number == NUMBER_UNDEFINED) { if (this == eoftoken || this->alias == eoftoken) this->number = this->alias->number = 0; else { - assert (this->alias->number != -1); + assert (this->alias->number != NUMBER_UNDEFINED); this->number = this->alias->number; } } @@ -215,7 +215,7 @@ symbol_pack (symbol_t *this) } else /* this->class == token_sym */ { - assert (this->number != -1); + assert (this->number != NUMBER_UNDEFINED); } symbols[this->number] = this; @@ -237,7 +237,7 @@ symbol_translation (symbol_t *this) && this->user_token_number != SALIAS) { /* A token which translation has already been set? */ - if (token_translations[this->user_token_number] != 2) + if (token_translations[this->user_token_number] != undeftoken->number) complain (_("tokens %s and %s both assigned number %d"), symbols[token_translations[this->user_token_number]]->tag, this->tag, this->user_token_number); @@ -326,7 +326,7 @@ get_type_name (int n, symbol_list *rule) complain (_("invalid $ value")); return NULL; } - i++; + ++i; } return rp->sym->type_name; @@ -369,7 +369,7 @@ copy_string2 (FILE *fin, struct obstack *oout, int match, int store) obstack_1grow (oout, c); if (c == '\n') - lineno++; + ++lineno; } c = getc (fin); @@ -452,7 +452,7 @@ copy_comment (FILE *fin, struct obstack *oout) } else if (c == '\n') { - lineno++; + ++lineno; obstack_1grow (oout, c); if (cplus_comment) ended = 1; @@ -614,7 +614,7 @@ copy_definition (void) { case '\n': obstack_1grow (&attrs_obstack, c); - lineno++; + ++lineno; break; case '%': @@ -705,7 +705,7 @@ parse_token_decl (symbol_class what_is, symbol_class what_is_not) symbol->class = what_is; if (what_is == nterm_sym && oldclass != nterm_sym) symbol->number = nvars++; - if (what_is == token_sym && symbol->number == -1) + if (what_is == token_sym && symbol->number == NUMBER_UNDEFINED) symbol->number = ntokens++; if (typename) @@ -826,7 +826,8 @@ parse_assoc_decl (associativity assoc) char *name = NULL; int prev = 0; - lastprec++; /* Assign a new precedence level, never 0. */ + /* Assign a new precedence level, never 0. */ + ++lastprec; for (;;) { @@ -856,7 +857,7 @@ parse_assoc_decl (associativity assoc) symval->assoc = assoc; if (symval->class == nterm_sym) complain (_("symbol %s redefined"), symval->tag); - if (symval->number == -1) + if (symval->number == NUMBER_UNDEFINED) { symval->number = ntokens++; symval->class = token_sym; @@ -931,7 +932,7 @@ parse_union_decl (void) switch (c) { case '\n': - lineno++; + ++lineno; break; case '/': @@ -939,7 +940,7 @@ parse_union_decl (void) break; case '{': - count++; + ++count; break; case '}': @@ -1276,12 +1277,12 @@ parse_braces (symbol_list *rule, int stack_offset) { case '\n': obstack_1grow (&action_obstack, c); - lineno++; + ++lineno; break; case '{': obstack_1grow (&action_obstack, c); - count++; + ++count; break; case '\'': @@ -1431,8 +1432,8 @@ readgram (void) } /* start a new rule and record its lhs. */ - nrules++; - nitems++; + ++nrules; + ++nritems; p = symbol_list_new (lhs); @@ -1451,7 +1452,7 @@ readgram (void) { lhs->class = nterm_sym; lhs->number = nvars; - nvars++; + ++nvars; } else if (lhs->class == token_sym) complain (_("rule given for %s, which is a token"), lhs->tag); @@ -1509,8 +1510,8 @@ readgram (void) /* Make a new rule, whose body is empty, before the current one, so that the action just read can belong to it. */ - nrules++; - nitems++; + ++nrules; + ++nritems; p = symbol_list_new (sdummy); /* Attach its lineno to that of the host rule. */ p->line = crule->line; @@ -1531,7 +1532,7 @@ readgram (void) /* Insert the dummy generated by that rule into this rule. */ - nitems++; + ++nritems; p = symbol_list_new (sdummy); p1->next = p; p1 = p; @@ -1541,7 +1542,7 @@ readgram (void) if (t == tok_identifier) { - nitems++; + ++nritems; p = symbol_list_new (symval); p1->next = p; p1 = p; @@ -1550,9 +1551,9 @@ readgram (void) { parse_action (crule, rulelength); action_flag = 1; - xactions++; /* JF */ + ++xactions; /* JF */ } - rulelength++; + ++rulelength; } /* end of read rhs of rule */ /* Put an empty link in the list to mark the end of this rule */ @@ -1584,7 +1585,7 @@ readgram (void) complain (_("two actions at end of one rule")); parse_action (crule, rulelength); action_flag = 1; - xactions++; /* -wjh */ + ++xactions; /* -wjh */ t = lex (); } /* If $$ is being set in default way, report if any type @@ -1632,13 +1633,13 @@ readgram (void) p->next->next->next = symbol_list_new (NULL); p->next->next->next->next = grammar; nrules += 1; - nitems += 3; + nritems += 3; grammar = p; startval = axiom; - if (nsyms > MAXSHORT) + if (nsyms > SHRT_MAX) fatal (_("too many symbols (tokens plus nonterminals); maximum %d"), - MAXSHORT); + SHRT_MAX); assert (nsyms == ntokens + nvars); } @@ -1677,27 +1678,48 @@ read_additionnal_code (void) static void token_translations_init (void) { - int last_user_token_number = 256; + int num_256_available_p = TRUE; int i; - /* Set the user numbers. */ + /* Find the highest user token number, and whether 256, the POSIX + preferred user token number for the error token, is used. */ + max_user_token_number = 0; + for (i = 0; i < ntokens; ++i) + { + symbol_t *this = symbols[i]; + if (this->user_token_number != SUNDEF) + { + if (this->user_token_number > max_user_token_number) + max_user_token_number = this->user_token_number; + if (this->user_token_number == 256) + num_256_available_p = FALSE; + } + } + + /* If 256 is not used, assign it to error, to follow POSIX. */ + if (num_256_available_p && errtoken->user_token_number == SUNDEF) + errtoken->user_token_number = 256; + + /* Set the missing user numbers. */ + if (max_user_token_number < 256) + max_user_token_number = 256; + for (i = 0; i < ntokens; ++i) { symbol_t *this = symbols[i]; if (this->user_token_number == SUNDEF) - this->user_token_number = ++last_user_token_number; + this->user_token_number = ++max_user_token_number; if (this->user_token_number > max_user_token_number) max_user_token_number = this->user_token_number; } - token_translations = XCALLOC (short, max_user_token_number + 1); + token_translations = XCALLOC (token_number_t, max_user_token_number + 1); /* Initialize all entries for literal tokens to 2, the internal token number for $undefined., which represents all invalid inputs. */ for (i = 0; i < max_user_token_number + 1; i++) - token_translations[i] = 2; - + token_translations[i] = undeftoken->number; symbols_do (symbol_translation, NULL); } @@ -1717,8 +1739,6 @@ packsymbols (void) token_translations_init (); - error_token_number = errtoken->number; - if (startval->class == unknown_sym) fatal (_("the start symbol %s is undefined"), startval->tag); else if (startval->class == token_sym) @@ -1740,11 +1760,7 @@ packgram (void) int ruleno; symbol_list *p; - /* We use short to index items. */ - if (nitems >= MAXSHORT) - fatal (_("too many items (max %d)"), MAXSHORT); - - ritem = XCALLOC (short, nitems + 1); + ritem = XCALLOC (item_number_t, nritems + 1); rules = XCALLOC (rule_t, nrules) - 1; itemno = 0; @@ -1768,7 +1784,9 @@ packgram (void) p = p->next; while (p && p->sym) { - ritem[itemno++] = p->sym->number; + /* item_number_t = token_number_t. + But the former needs to contain more: negative rule numbers. */ + ritem[itemno++] = token_number_as_item_number (p->sym->number); /* A rule gets by default the precedence and associativity of the last token in it. */ if (p->sym->class == token_sym) @@ -1785,15 +1803,14 @@ packgram (void) rules[ruleno].prec = ruleprec; } ritem[itemno++] = -ruleno; - ruleno++; + ++ruleno; if (p) p = p->next; } ritem[itemno] = 0; - nritems = itemno; - assert (nritems == nitems); + assert (itemno == nritems); if (trace_flag) ritem_print (stderr); @@ -1828,14 +1845,12 @@ reader (void) errtoken = getsym ("error"); errtoken->class = token_sym; errtoken->number = ntokens++; - 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."); undeftoken->class = token_sym; undeftoken->number = ntokens++; - undeftoken->user_token_number = 2; /* Initialize the obstacks. */ obstack_init (&action_obstack);