aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/rust/expand/rust-macro-expand.cc9
-rw-r--r--gcc/testsuite/rust/compile/macro-issue2273.rs7
2 files changed, 16 insertions, 0 deletions
diff --git a/gcc/rust/expand/rust-macro-expand.cc b/gcc/rust/expand/rust-macro-expand.cc
index a4ad16a..4ac6fdc 100644
--- a/gcc/rust/expand/rust-macro-expand.cc
+++ b/gcc/rust/expand/rust-macro-expand.cc
@@ -911,6 +911,15 @@ transcribe_expression (Parser<MacroInvocLexer> &parser)
if (expr == nullptr)
return AST::Fragment::create_error ();
+ // FIXME: make this an error for some edititons
+ if (parser.peek_current_token ()->get_id () == SEMICOLON)
+ {
+ rust_warning_at (
+ parser.peek_current_token ()->get_locus (), 0,
+ "trailing semicolon in macro used in expression context");
+ parser.skip_token ();
+ }
+
auto end = lexer.get_offs ();
return AST::Fragment ({std::move (expr)}, lexer.get_token_slice (start, end));
diff --git a/gcc/testsuite/rust/compile/macro-issue2273.rs b/gcc/testsuite/rust/compile/macro-issue2273.rs
new file mode 100644
index 0000000..ee3dd1f
--- /dev/null
+++ b/gcc/testsuite/rust/compile/macro-issue2273.rs
@@ -0,0 +1,7 @@
+macro_rules! mac {
+ () => {();} // { dg-warning "trailing semicolon" }
+}
+
+pub fn foo() {
+ mac!()
+}