public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Thomas Schwinge <tschwinge@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/rust/master] macro-substitute: Do not substitute non-repetition fragments in sub-maps Date: Wed, 8 Jun 2022 12:14:56 +0000 (GMT) [thread overview] Message-ID: <20220608121456.83C823816EFE@sourceware.org> (raw) https://gcc.gnu.org/g:a498b2c5d6d64c40955b3c13fd6ca8dc72a7bd67 commit a498b2c5d6d64c40955b3c13fd6ca8dc72a7bd67 Author: Arthur Cohen <arthur.cohen@embecosm.com> Date: Tue Mar 1 15:15:07 2022 +0100 macro-substitute: Do not substitute non-repetition fragments in sub-maps When creating a sub-map for repetitions, we need to be weary of not accessing matched-fragments beyond the vector's size. For example, with the following *fragments* { "e": [1], "es": [2, 3, 10]}, the sub-maps we want to create are the following: { "e": [1], "es": [2]}, { "e": [1], "es": [3]}, { "e": [1], "es": [10]}, Up until this point however, we were trying to access the second index for the "e" metavar when creating the second submap, then the third, and so on... which is obviously outside of the vector's bounds. We can simply check if the metavar only has one match and expand that one in that case. We still need to work on checking that multiple metavars in the same transcriber repetition pattern have the same amount of matched fragments (ie the original vectors of matches in the original map have the same size) Diff: --- gcc/rust/expand/rust-macro-substitute-ctx.cc | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/gcc/rust/expand/rust-macro-substitute-ctx.cc b/gcc/rust/expand/rust-macro-substitute-ctx.cc index 8542614fb60..3d07b484134 100644 --- a/gcc/rust/expand/rust-macro-substitute-ctx.cc +++ b/gcc/rust/expand/rust-macro-substitute-ctx.cc @@ -17,8 +17,8 @@ SubstituteCtx::substitute_metavar (std::unique_ptr<AST::Token> &metavar) else { // Replace - // We only care about the vector when expanding repetitions. Just access - // the first element of the vector. + // We only care about the vector when expanding repetitions. + // Just access the first element of the vector. // FIXME: Clean this up so it makes more sense auto &frag = it->second[0]; for (size_t offs = frag.token_offset_begin; offs < frag.token_offset_end; @@ -103,7 +103,13 @@ SubstituteCtx::substitute_repetition (size_t pattern_start, size_t pattern_end) for (auto &kv_match : fragments) { std::vector<MatchedFragment> sub_vec; - sub_vec.emplace_back (kv_match.second[i]); + + // FIXME: Hack: If a fragment is not repeated, how does it fit in the + // submap? Do we really want to expand it? Is this normal behavior? + if (kv_match.second.size () == 1) + sub_vec.emplace_back (kv_match.second[0]); + else + sub_vec.emplace_back (kv_match.second[i]); sub_map.insert ({kv_match.first, sub_vec}); } @@ -177,6 +183,7 @@ std::vector<std::unique_ptr<AST::Token>> SubstituteCtx::substitute_tokens () { std::vector<std::unique_ptr<AST::Token>> replaced_tokens; + rust_debug ("expanding tokens"); for (size_t i = 0; i < macro.size (); i++) {
next reply other threads:[~2022-06-08 12:14 UTC|newest] Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-06-08 12:14 Thomas Schwinge [this message] -- strict thread matches above, loose matches on Subject: below -- 2022-06-08 12:14 Thomas Schwinge
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220608121456.83C823816EFE@sourceware.org \ --to=tschwinge@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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).