public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc/devel/rust/master] macro_invoc_lexer: Add `split_current_token` implementation
@ 2023-02-28 22:36 Thomas Schwinge
0 siblings, 0 replies; only message in thread
From: Thomas Schwinge @ 2023-02-28 22:36 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:cda1d7852d6a82df6eea53deb73aab3d459b4443
commit cda1d7852d6a82df6eea53deb73aab3d459b4443
Author: Arthur Cohen <arthur.cohen@embecosm.com>
Date: Tue Feb 21 13:51:54 2023 +0100
macro_invoc_lexer: Add `split_current_token` implementation
gcc/rust/ChangeLog:
* expand/rust-macro-invoc-lexer.cc (MacroInvocLexer::split_current_token):
Add proper implementation.
gcc/testsuite/ChangeLog:
* rust/compile/expand_macro_qual_path_in_type.rs: New test.
Diff:
---
gcc/rust/expand/rust-macro-invoc-lexer.cc | 21 ++++++--
.../rust/compile/expand_macro_qual_path_in_type.rs | 62 ++++++++++++++++++++++
2 files changed, 78 insertions(+), 5 deletions(-)
diff --git a/gcc/rust/expand/rust-macro-invoc-lexer.cc b/gcc/rust/expand/rust-macro-invoc-lexer.cc
index 321f0f97a76..66a3a6922fc 100644
--- a/gcc/rust/expand/rust-macro-invoc-lexer.cc
+++ b/gcc/rust/expand/rust-macro-invoc-lexer.cc
@@ -1,4 +1,5 @@
#include "rust-macro-invoc-lexer.h"
+#include "rust-token.h"
namespace Rust {
@@ -19,12 +20,22 @@ MacroInvocLexer::skip_token (int n)
}
void
-MacroInvocLexer::split_current_token (TokenId new_left __attribute__ ((unused)),
- TokenId new_right
- __attribute__ ((unused)))
+MacroInvocLexer::split_current_token (TokenId new_left, TokenId new_right)
{
- // FIXME
- gcc_unreachable ();
+ auto ¤t_token = token_stream.at (offs);
+ auto current_pos = token_stream.begin () + offs;
+
+ auto l_tok = Token::make (new_left, current_token->get_locus ());
+ auto r_tok = Token::make (new_right, current_token->get_locus ());
+
+ token_stream.erase (current_pos);
+
+ // `insert` inserts before the specified position, so we insert the right one
+ // then the left
+ token_stream.insert (current_pos,
+ std::unique_ptr<AST::Token> (new AST::Token (r_tok)));
+ token_stream.insert (current_pos,
+ std::unique_ptr<AST::Token> (new AST::Token (l_tok)));
}
std::vector<std::unique_ptr<AST::Token>>
diff --git a/gcc/testsuite/rust/compile/expand_macro_qual_path_in_type.rs b/gcc/testsuite/rust/compile/expand_macro_qual_path_in_type.rs
new file mode 100644
index 00000000000..2d60197e15c
--- /dev/null
+++ b/gcc/testsuite/rust/compile/expand_macro_qual_path_in_type.rs
@@ -0,0 +1,62 @@
+// this SEGVs in lowering for now
+// { dg-additional-options "-frust-compile-until=nameresolution" }
+
+macro_rules! forward_ref_binop {
+ (impl $imp:ident, $method:ident for $t:ty, $u:ty) => {
+ forward_ref_binop!(impl $imp, $method for $t, $u,
+ #[stable(feature = "rust1", since = "1.0.0")]);
+ };
+ (impl $imp:ident, $method:ident for $t:ty, $u:ty, #[$attr:meta]) => {
+ #[$attr]
+ impl<'a> $imp<$u> for &'a $t {
+ type Output = <$t as $imp<$u>>::Output;
+
+ #[inline]
+ fn $method(self, other: $u) -> <$t as $imp<$u>>::Output {
+ $imp::$method(*self, other)
+ }
+ }
+
+ #[$attr]
+ impl<'a> $imp<&'a $u> for $t {
+ type Output = <$t as $imp<$u>>::Output;
+
+ #[inline]
+ fn $method(self, other: &'a $u) -> <$t as $imp<$u>>::Output {
+ $imp::$method(self, *other)
+ }
+ }
+
+ #[$attr]
+ impl<'a, 'b> $imp<&'a $u> for &'b $t {
+ type Output = <$t as $imp<$u>>::Output;
+
+ #[inline]
+ fn $method(self, other: &'a $u) -> <$t as $imp<$u>>::Output {
+ $imp::$method(*self, *other)
+ }
+ }
+ }
+}
+
+#[lang = "add"]
+pub trait Add<RHS = Self> {
+ type Output;
+
+ fn add(self, rhs: RHS) -> Self::Output;
+}
+
+macro_rules! add_impl {
+ ($($t:ty)*) => ($(
+ #[stable(feature = "rust1", since = "1.0.0")]
+ impl Add for $t {
+ type Output = $t;
+
+ fn add(self, other: $t) -> $t { self + other }
+ }
+
+ forward_ref_binop! { impl Add, add for $t, $t }
+ )*)
+}
+
+add_impl! { usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 f32 f64 }
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-02-28 22:36 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-28 22:36 [gcc/devel/rust/master] macro_invoc_lexer: Add `split_current_token` implementation 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).