public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r14-8051] gccrs: Allow macro named macro_rules
@ 2024-01-16 18:14 Arthur Cohen
0 siblings, 0 replies; only message in thread
From: Arthur Cohen @ 2024-01-16 18:14 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:68a8a5503729c6b45b58e0147ebba675db6fbfd5
commit r14-8051-g68a8a5503729c6b45b58e0147ebba675db6fbfd5
Author: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
Date: Tue Oct 10 15:46:48 2023 +0200
gccrs: Allow macro named macro_rules
Change the constraints around macro rules declaration in order to allow
macro_rules named macro as well as tighter constraint around macro rules
definitions.
gcc/rust/ChangeLog:
* parse/rust-parse-impl.h (Parser::is_macro_rules_def): Add a function
that checks tokens given by the lexer represents an accurate macro
definition. This will reduce code duplication.
(Parser::parse_item): Replace condition with call to new checking
function.
(Parser::parse_stmt): Likewise.
* parse/rust-parse.h: Add function prototype for is_macro_rules_def.
Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
Diff:
---
gcc/rust/parse/rust-parse-impl.h | 17 ++++++++++++++---
gcc/rust/parse/rust-parse.h | 1 +
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/gcc/rust/parse/rust-parse-impl.h b/gcc/rust/parse/rust-parse-impl.h
index 63dea9836df..71f76f8e2eb 100644
--- a/gcc/rust/parse/rust-parse-impl.h
+++ b/gcc/rust/parse/rust-parse-impl.h
@@ -1071,6 +1071,18 @@ Parser<ManagedTokenSource>::parse_token_tree ()
}
}
+template <typename ManagedTokenSource>
+bool
+Parser<ManagedTokenSource>::is_macro_rules_def (const_TokenPtr t)
+{
+ auto macro_name = lexer.peek_token (2)->get_id ();
+
+ bool allowed_macro_name = (macro_name == IDENTIFIER || macro_name == TRY);
+
+ return t->get_str () == "macro_rules"
+ && lexer.peek_token (1)->get_id () == EXCLAM && allowed_macro_name;
+}
+
// Parses a single item
template <typename ManagedTokenSource>
std::unique_ptr<AST::Item>
@@ -1142,7 +1154,7 @@ Parser<ManagedTokenSource>::parse_item (bool called_from_statement)
"default", "impl"));
return nullptr;
}
- else if (t->get_str () == "macro_rules")
+ else if (is_macro_rules_def (t))
{
// macro_rules! macro item
return parse_macro_rules_def (std::move (outer_attrs));
@@ -6233,8 +6245,7 @@ Parser<ManagedTokenSource>::parse_stmt (ParseRestrictions restrictions)
return parse_vis_item (std::move (outer_attrs));
// or should this go straight to parsing union?
}
- else if (t->get_str () == "macro_rules"
- && lexer.peek_token (1)->get_id () == EXCLAM)
+ else if (is_macro_rules_def (t))
{
// macro_rules! macro item
return parse_macro_rules_def (std::move (outer_attrs));
diff --git a/gcc/rust/parse/rust-parse.h b/gcc/rust/parse/rust-parse.h
index 904b5028a75..d5c1219b080 100644
--- a/gcc/rust/parse/rust-parse.h
+++ b/gcc/rust/parse/rust-parse.h
@@ -141,6 +141,7 @@ public:
parse_block_expr (AST::AttrVec outer_attrs = AST::AttrVec (),
location_t pratt_parsed_loc = UNKNOWN_LOCATION);
+ bool is_macro_rules_def (const_TokenPtr t);
std::unique_ptr<AST::Item> parse_item (bool called_from_statement);
std::unique_ptr<AST::Pattern> parse_pattern ();
std::unique_ptr<AST::Pattern> parse_pattern_no_alt ();
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2024-01-16 18:14 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-16 18:14 [gcc r14-8051] gccrs: Allow macro named macro_rules Arthur Cohen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).