Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-13 14:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

style: rename user_token_number as code

Browse Source 
This should have been done in 3.6, but I wanted to avoid introducing
conflicts into Vincent's work on counterexamples.  It turns out it's
completely orthogonal.

* data/README.md, data/skeletons/bison.m4, data/skeletons/c++.m4,
* data/skeletons/c.m4, data/skeletons/glr.c, data/skeletons/java.m4,
* data/skeletons/lalr1.d, data/skeletons/lalr1.java,
* data/skeletons/variant.hh, data/skeletons/yacc.c, src/conflicts.c,
* src/derives.c, src/gram.c, src/gram.h, src/output.c,
* src/parse-gram.c, src/parse-gram.y, src/print-xml.c, src/print.c,
* src/reader.c, src/symtab.c, src/symtab.h, tests/input.at,
* tests/types.at:
s/user_token_number/code/g.
Plus minor changes.
This commit is contained in:
Akim Demaille
2020-05-22 20:12:03 +02:00
parent 339d11badf
commit e7aff57122
25 changed files with 88 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/output.c
View File

@@ -274,12 +274,12 @@ prepare_symbols (void)
MUSCLE_INSERT_INT ("tokens_number", ntokens);
MUSCLE_INSERT_INT ("nterms_number", nvars);
MUSCLE_INSERT_INT ("symbols_number", nsyms);
MUSCLE_INSERT_INT ("user_token_number_max", max_user_token_number);
MUSCLE_INSERT_INT ("code_max", max_code);
muscle_insert_symbol_number_table ("translate",
token_translations,
token_translations[0],
1, max_user_token_number + 1);
1, max_code + 1);
/* tname -- token names. */
prepare_symbol_names ("tname");
@@ -309,7 +309,7 @@ prepare_symbols (void)
{
int *values = xnmalloc (ntokens, sizeof *values);
for (int i = 0; i < ntokens; ++i)
values[i] = symbols[i]->content->user_token_number;
values[i] = symbols[i]->content->code;
muscle_insert_int_table ("toknum", values,
values[0], 1, ntokens);
free (values);
@@ -565,8 +565,8 @@ prepare_symbol_definitions (void)
SET_KEY ("tag");
MUSCLE_INSERT_STRING (key, symbol_tag (sym));
SET_KEY ("user_number");
MUSCLE_INSERT_INT (key, sym->content->user_token_number);
SET_KEY ("code");
MUSCLE_INSERT_INT (key, sym->content->code);
SET_KEY ("is_token");
MUSCLE_INSERT_INT (key, i < ntokens);