Rename token.prefix as api.tokens.prefix.

Discussed here.
http://lists.gnu.org/archive/html/bison-patches/2009-05/msg00024.html.

	* NEWS, data/bison.m4, data/c.m4, data/java.m4, doc/bison.texinfo,
	* tests/c++.at, tests/calc.at, tests/java.at, tests/local.at
	(token.prefix): Rename as...
	(api.tokens.prefix): this.
This commit is contained in:
Akim Demaille
2009-05-15 16:06:31 +02:00
parent 3c248d705d
commit 4c6622c2dd
10 changed files with 67 additions and 55 deletions

View File

@@ -355,7 +355,7 @@ m4_define([b4_symbol_],
# undefined. If FIELD = id, prepend the prefix.
m4_define([b4_symbol],
[m4_case([$2],
[id], [m4_do([b4_percent_define_get([token.prefix])],
[id], [m4_do([b4_percent_define_get([api.tokens.prefix])],
[b4_symbol_([$1], [id])])],
[b4_symbol_($@)])])
@@ -769,8 +769,8 @@ m4_define([b4_percent_code_ifdef],
# Default values for %define.
# ---------------------------
# If the %token.prefix, it is empty.
m4_percent_define_default([[token.prefix]], [[]])
# If the api.tokens.prefix, it is empty.
m4_percent_define_default([[api.tokens.prefix]], [[]])

View File

@@ -190,7 +190,7 @@ static const b4_int_type_for([$2]) yy$1[[]] =
# -----------------------------------------
# Output the definition of this token as #define.
m4_define([b4_token_define],
[#define b4_percent_define_get([token.prefix])$1 $2
[#define b4_percent_define_get([api.tokens.prefix])$1 $2
])
@@ -208,7 +208,7 @@ m4_map([b4_token_define], [$@])])
# ---------------------------------------
# Output the definition of this token as an enum.
m4_define([b4_token_enum],
[b4_percent_define_get([token.prefix])$1 = $2])
[b4_percent_define_get([api.tokens.prefix])$1 = $2])
# b4_token_enums(LIST-OF-PAIRS-TOKEN-NAME-TOKEN-NUMBER)

View File

@@ -147,7 +147,7 @@ m4_define([b4_integral_parser_table_define],
# Output the definition of this token as an enum.
m4_define([b4_token_enum],
[ /** Token number, to be returned by the scanner. */
static final int b4_percent_define_get([token.prefix])$1 = $2;
static final int b4_percent_define_get([api.tokens.prefix])$1 = $2;
])