[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 01/10] tokens: style: minor fixes
From: |
Akim Demaille |
Subject: |
[PATCH 01/10] tokens: style: minor fixes |
Date: |
Sun, 12 Apr 2020 14:22:28 +0200 |
* data/skeletons/bison.m4 (b4_symbol_kind): Dispatch on the UNDEF
token number rather than its name.
* data/skeletons/c++.m4, data/skeletons/c.m4, data/skeletons/java.m4:
Comment changes.
---
data/skeletons/bison.m4 | 2 +-
data/skeletons/c++.m4 | 17 +++++++++--------
data/skeletons/c.m4 | 12 ++++++------
data/skeletons/java.m4 | 15 ++++++++-------
4 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/data/skeletons/bison.m4 b/data/skeletons/bison.m4
index 1188739d..a2bb1cf5 100644
--- a/data/skeletons/bison.m4
+++ b/data/skeletons/bison.m4
@@ -418,9 +418,9 @@ m4_case([$1],
[-2], [[YYEMPTY]],
[0], [[YYEOF]],
[1], [[YYERROR]],
+ [2], [[YYUNDEF]],
[m4_case(b4_symbol([$1], [tag]),
[$accept], [[YYACCEPT]],
- [$undefined], [[YYUNDEF]],
[b4_symbol_if([$1], [has_id], _b4_symbol([$1], [id]),
[m4_bpatsubst([$1-][]_b4_symbol([$1],
[tag]), [[^a-zA-Z_0-9]+], [_])])])])])
diff --git a/data/skeletons/c++.m4 b/data/skeletons/c++.m4
index b8512b44..1c77d57f 100644
--- a/data/skeletons/c++.m4
+++ b/data/skeletons/c++.m4
@@ -162,9 +162,10 @@
m4_bpatsubst(m4_dquote(m4_bpatsubst(m4_dquote(b4_namespace_ref[ ]),
[::\([^][:]\|:[^:]\)*], [} ])[} // ]b4_namespace_ref])])
-## -------------------------- ##
-## (External) token numbers. ##
-## -------------------------- ##
+## ------------- ##
+## Token kinds. ##
+## ------------- ##
+
# b4_token_enums
# --------------
@@ -172,15 +173,15 @@
m4_bpatsubst(m4_dquote(m4_bpatsubst(m4_dquote(b4_namespace_ref[ ]),
m4_define([b4_token_enums],
[[enum yytokentype
{
-]b4_symbol_foreach([b4_token_enum])[
- };]dnl
+]b4_symbol_foreach([b4_token_enum])dnl
+[ };]dnl
])
-## --------------------------- ##
-## (Internal) symbol numbers. ##
-## --------------------------- ##
+## -------------- ##
+## Symbol kinds. ##
+## -------------- ##
# b4_declare_symbol_enum
# ----------------------
diff --git a/data/skeletons/c.m4 b/data/skeletons/c.m4
index 7e7a5c2a..dba9928b 100644
--- a/data/skeletons/c.m4
+++ b/data/skeletons/c.m4
@@ -426,9 +426,9 @@ static const b4_int_type_for([$2]) yy$1[[]] =
])
-## -------------------------- ##
-## (External) token numbers. ##
-## -------------------------- ##
+## ------------- ##
+## Token kinds. ##
+## ------------- ##
# b4_token_define(TOKEN-NUM)
# --------------------------
@@ -491,9 +491,9 @@ m4_define([b4_symbol_translate],
-## --------------------------- ##
-## (Internal) symbol numbers. ##
-## --------------------------- ##
+## -------------- ##
+## Symbol kinds. ##
+## -------------- ##
# b4_symbol_enum(SYMBOL-NUM)
# --------------------------
diff --git a/data/skeletons/java.m4 b/data/skeletons/java.m4
index bef9aa01..d09890a1 100644
--- a/data/skeletons/java.m4
+++ b/data/skeletons/java.m4
@@ -128,9 +128,10 @@ m4_define([b4_integral_parser_table_define],
[b4_typed_parser_table_define([b4_int_type_for([$2])], [$1], [$2], [$3])])
-## -------------------------- ##
-## (External) token numbers. ##
-## -------------------------- ##
+## ------------- ##
+## Token kinds. ##
+## ------------- ##
+
# b4_token_enum(TOKEN-NUM)
# ------------------------
@@ -144,14 +145,14 @@ m4_define([b4_token_enum],
# --------------
# Output the definition of the tokens (if there are) as enums.
m4_define([b4_token_enums],
-[b4_any_token_visible_if([/* Token kinds. */
+[b4_any_token_visible_if([ /* Token kinds. */
b4_symbol_foreach([b4_token_enum])])])
-## --------------------------- ##
-## (Internal) symbol numbers. ##
-## --------------------------- ##
+## -------------- ##
+## Symbol kinds. ##
+## -------------- ##
# b4_symbol_enum(SYMBOL-NUM)
# --------------------------
--
2.26.0
- [PATCH 00/10] Clean up the handling of the tokens, Akim Demaille, 2020/04/12
- [PATCH 01/10] tokens: style: minor fixes,
Akim Demaille <=
- [PATCH 02/10] tokens: properly define the "error" token kind, Akim Demaille, 2020/04/12
- [PATCH 03/10] tokens: define the "$undefined" token kind, Akim Demaille, 2020/04/12
- [PATCH 05/10] c++: remove the yy prefix from some functions, Akim Demaille, 2020/04/12
- [PATCH 08/10] skeletons: make the eof token translatable if i18n is enabled, Akim Demaille, 2020/04/12
- [PATCH 04/10] tokens: properly define the YYEOF token kind, Akim Demaille, 2020/04/12
- [PATCH 06/10] diagnostics: replace "user token number" by "token code", Akim Demaille, 2020/04/12
- [PATCH 09/10] skeletons: use "invalid token" instead of "$undefined", Akim Demaille, 2020/04/12
- [PATCH 10/10] skeletons: clarify the tag of special tokens, Akim Demaille, 2020/04/12
- [PATCH 07/10] skeletons: use "end of file" instead of "$end", Akim Demaille, 2020/04/12