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

m4: rename b4_symbol_sid as b4_symbol_kind

Browse Source 
* data/skeletons/bison.m4, data/skeletons/c++.m4, data/skeletons/c.m4,
* data/skeletons/d.m4, data/skeletons/java.m4
(b4_symbol_sid): Rename as...
(b4_symbol_kind): this.
Adjust dependencies.
* data/README.md: Document the kind.
This commit is contained in:
Akim Demaille
2020-04-05 11:39:42 +02:00
parent ff2fc62138
commit 2b7bde9d13
6 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
data/skeletons/bison.m4
View File

@@ -405,13 +405,13 @@ m4_define([_b4_symbol],
[__b4_symbol([$1], [$2])])])
# b4_symbol_sid(NUM)
# ------------------
# Build the symbol ID based for this symbol. It must always exist,
# b4_symbol_kind(NUM)
# -------------------
# Build the name of the kind of this symbol. It must always exist,
# otherwise some symbols might not be represented in the enum, which
# might be compiled into too small a type to contain all the symbol
# numbers.
m4_define([b4_symbol_sid],
m4_define([b4_symbol_kind],
[m4_case([$1],
[-2], [[YYSYMBOL_YYEMPTY]],
[0], [[YYSYMBOL_YYEOF]],
@@ -433,7 +433,7 @@ m4_define([b4_symbol],
[m4_case([$2],
[id], [m4_do([b4_percent_define_get([api.token.prefix])],
[_b4_symbol([$1], [id])])],
[sid], [b4_symbol_sid([$1])],
[kind], [b4_symbol_kind([$1])],
[_b4_symbol($@)])])

2
data/skeletons/c++.m4
View File

@@ -192,7 +192,7 @@ m4_define([b4_declare_symbol_enum],
{
]m4_join([,
],
]b4_symbol_sid([-2])[ = -2,
]b4_symbol_kind([-2])[ = -2,
b4_symbol_map([b4_symbol_enum]),
[YYNTOKENS = ]b4_tokens_number[ ///< Number of tokens.])[
};

6
data/skeletons/c.m4
View File

@@ -495,9 +495,9 @@ m4_define([b4_symbol_translate],
# --------------------------
# Output the definition of this symbol as an enum.
m4_define([b4_symbol_enum],
[m4_ifval(b4_symbol([$1], [sid]),
[m4_ifval(b4_symbol([$1], [kind]),
[m4_format([[%s = %s]],
b4_symbol([$1], [sid]),
b4_symbol([$1], [kind]),
b4_symbol([$1], [number]))])])
@@ -512,7 +512,7 @@ enum yysymbol_kind_t
{
]m4_join([,
],
]b4_symbol_sid([-2])[ = -2,
]b4_symbol_kind([-2])[ = -2,
b4_symbol_map([b4_symbol_enum]))[
};
typedef enum yysymbol_kind_t yysymbol_kind_t;

6
data/skeletons/d.m4
View File

@@ -181,9 +181,9 @@ b4_symbol_foreach([b4_token_enum])
# --------------------------
# Output the definition of this symbol as an enum.
m4_define([b4_symbol_enum],
[m4_ifval(b4_symbol([$1], [sid]),
[m4_ifval(b4_symbol([$1], [kind]),
[m4_format([[%s = %s]],
b4_symbol([$1], [sid]),
b4_symbol([$1], [kind]),
b4_symbol([$1], [number]))])])
@@ -198,7 +198,7 @@ m4_define([b4_declare_symbol_enum],
{
]m4_join([,
],
]b4_symbol_sid([-2])[ = -2,
]b4_symbol_kind([-2])[ = -2,
b4_symbol_map([b4_symbol_enum]))[
};
]])])

8
data/skeletons/java.m4
View File

@@ -157,9 +157,9 @@ b4_symbol_foreach([b4_token_enum])])])
# --------------------------
# Output the definition of this symbol as an enum.
m4_define([b4_symbol_enum],
[m4_ifval(b4_symbol([$1], [sid]),
[m4_ifval(b4_symbol([$1], [kind]),
[m4_format([[%s(%s)]],
b4_symbol([$1], [sid]),
b4_symbol([$1], [kind]),
b4_symbol([$1], [number]))])])
@@ -171,7 +171,7 @@ m4_define([b4_declare_symbol_enum],
{
]m4_join([,
],
]b4_symbol_sid([-2])[(-2),
]b4_symbol_kind([-2])[(-2),
b4_symbol_map([b4_symbol_enum]))[;
private final int code_;
@@ -181,7 +181,7 @@ m4_define([b4_declare_symbol_enum],
}
private static final SymbolKind[] values_ = {
]m4_map_args_sep([b4_symbol_sid(], [)], [,
]m4_map_args_sep([b4_symbol_kind(], [)], [,
], b4_symbol_numbers)[
};