public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc/devel/rust/master] macros: Substitute separator if necessary when expanding repetitions
@ 2022-06-08 12:15 Thomas Schwinge
0 siblings, 0 replies; only message in thread
From: Thomas Schwinge @ 2022-06-08 12:15 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:4fde21b37a2de2d2915d13d108395e86980aef96
commit 4fde21b37a2de2d2915d13d108395e86980aef96
Author: Arthur Cohen <arthur.cohen@embecosm.com>
Date: Thu Mar 3 14:54:50 2022 +0100
macros: Substitute separator if necessary when expanding repetitions
Diff:
---
gcc/rust/expand/rust-macro-substitute-ctx.cc | 44 +++++++++++++++++++++++-----
gcc/rust/expand/rust-macro-substitute-ctx.h | 6 ++--
2 files changed, 40 insertions(+), 10 deletions(-)
diff --git a/gcc/rust/expand/rust-macro-substitute-ctx.cc b/gcc/rust/expand/rust-macro-substitute-ctx.cc
index 3d07b484134..f9f2005b72b 100644
--- a/gcc/rust/expand/rust-macro-substitute-ctx.cc
+++ b/gcc/rust/expand/rust-macro-substitute-ctx.cc
@@ -33,7 +33,9 @@ SubstituteCtx::substitute_metavar (std::unique_ptr<AST::Token> &metavar)
}
std::vector<std::unique_ptr<AST::Token>>
-SubstituteCtx::substitute_repetition (size_t pattern_start, size_t pattern_end)
+SubstituteCtx::substitute_repetition (
+ size_t pattern_start, size_t pattern_end,
+ std::unique_ptr<AST::Token> separator_token)
{
rust_assert (pattern_end < macro.size ());
@@ -117,6 +119,11 @@ SubstituteCtx::substitute_repetition (size_t pattern_start, size_t pattern_end)
auto substitute_context = SubstituteCtx (input, new_macro, sub_map);
auto new_tokens = substitute_context.substitute_tokens ();
+ // Skip the first repetition, but add the separator to the expanded
+ // tokens if it is present
+ if (i != 0 && separator_token)
+ expanded.emplace_back (separator_token->clone_token ());
+
for (auto &new_token : new_tokens)
expanded.emplace_back (new_token->clone_token ());
}
@@ -127,6 +134,13 @@ SubstituteCtx::substitute_repetition (size_t pattern_start, size_t pattern_end)
return expanded;
}
+static bool
+is_rep_op (std::unique_ptr<AST::Token> &tok)
+{
+ auto id = tok->get_id ();
+ return id == QUESTION_MARK || id == ASTERISK || id == PLUS;
+}
+
std::pair<std::vector<std::unique_ptr<AST::Token>>, size_t>
SubstituteCtx::substitute_token (size_t token_idx)
{
@@ -148,20 +162,34 @@ SubstituteCtx::substitute_token (size_t token_idx)
pattern_end++)
;
+ std::unique_ptr<AST::Token> separator_token = nullptr;
+ // FIXME: Can this go out of bounds?
+ auto &post_pattern_token = macro.at (pattern_end + 1);
+ if (!is_rep_op (post_pattern_token))
+ separator_token = post_pattern_token->clone_token ();
+
+ // Amount of tokens to skip
+ auto to_skip = 0;
+ // Parentheses
+ to_skip += 2;
+ // Repetition operator
+ to_skip += 1;
+ // Separator
+ if (separator_token)
+ to_skip += 1;
+
// FIXME: This skips whitespaces... Is that okay??
- // FIXME: Is there any existing parsing function that allows us to parse
- // a macro pattern?
+ // FIXME: Is there any existing parsing function that allows us to
+ // parse a macro pattern?
// FIXME: Add error handling in the case we haven't found a matching
// closing delimiter
// FIXME: We need to parse the repetition token now
- return {
- substitute_repetition (pattern_start, pattern_end),
- // + 2 for the opening and closing parentheses which are mandatory
- // + 1 for the repetitor (+, *, ?)
- pattern_end - pattern_start + 3};
+ return {substitute_repetition (pattern_start, pattern_end,
+ std::move (separator_token)),
+ pattern_end - pattern_start + to_skip};
}
// TODO: We need to check if the $ was alone. In that case, do
// not error out: Simply act as if there was an empty identifier
diff --git a/gcc/rust/expand/rust-macro-substitute-ctx.h b/gcc/rust/expand/rust-macro-substitute-ctx.h
index d51fb81c2c7..ed83926c32c 100644
--- a/gcc/rust/expand/rust-macro-substitute-ctx.h
+++ b/gcc/rust/expand/rust-macro-substitute-ctx.h
@@ -49,12 +49,14 @@ public:
* Substitute a macro repetition by its given fragments
*
* @param pattern_start Start index of the pattern tokens
- * @param pattern_end Index Amount of tokens in the pattern
+ * @param pattern_end End index of the patterns tokens
+ * @param separator Optional separator to include when expanding tokens
*
* @return A vector containing the repeated pattern
*/
std::vector<std::unique_ptr<AST::Token>>
- substitute_repetition (size_t pattern_start, size_t pattern_end);
+ substitute_repetition (size_t pattern_start, size_t pattern_end,
+ std::unique_ptr<AST::Token> separator);
/**
* Substitute a given token by its appropriate representation
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-06-08 12:15 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-08 12:15 [gcc/devel/rust/master] macros: Substitute separator if necessary when expanding repetitions Thomas Schwinge
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).