aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorSebastian Kirmayer <gnu@kirmayer.eu>2023-04-05 06:09:11 +0200
committerArthur Cohen <arthur.cohen@embecosm.com>2024-01-16 18:34:08 +0100
commit694063d84e47f57c99d4558e789932c31a7bf6dd (patch)
tree11e5fb50e1d86790cc922c9db61a1f2a8d88eadc /gcc
parentf2df348dcd5c7ef51e5a686a4d2473ae9bbb36bb (diff)
downloadgcc-694063d84e47f57c99d4558e789932c31a7bf6dd.zip
gcc-694063d84e47f57c99d4558e789932c31a7bf6dd.tar.gz
gcc-694063d84e47f57c99d4558e789932c31a7bf6dd.tar.bz2
gccrs: parser: macro: reject separator in `?` repetition
A matcher like $(a),? is no longer accepted. Fixes #2092. gcc/rust/ChangeLog: * parse/rust-parse-impl.h (Parser<ManagedTokenSource>::parse_macro_match_repetition): reject separator in `?` repetition gcc/testsuite/ChangeLog: * rust/compile/macro-issue2092.rs: New test. Signed-off-by: Sebastian Kirmayer <gnu@kirmayer.eu>
Diffstat (limited to 'gcc')
-rw-r--r--gcc/rust/parse/rust-parse-impl.h10
-rw-r--r--gcc/testsuite/rust/compile/macro-issue2092.rs4
2 files changed, 14 insertions, 0 deletions
diff --git a/gcc/rust/parse/rust-parse-impl.h b/gcc/rust/parse/rust-parse-impl.h
index e636252..6d20f48 100644
--- a/gcc/rust/parse/rust-parse-impl.h
+++ b/gcc/rust/parse/rust-parse-impl.h
@@ -2261,6 +2261,16 @@ Parser<ManagedTokenSource>::parse_macro_match_repetition ()
case QUESTION_MARK:
op = AST::MacroMatchRepetition::ZERO_OR_ONE;
lexer.skip_token ();
+
+ if (separator != nullptr)
+ {
+ add_error (
+ Error (separator->get_locus (),
+ "the %<?%> macro repetition operator does not take a "
+ "separator"));
+ separator = nullptr;
+ }
+
break;
default:
add_error (
diff --git a/gcc/testsuite/rust/compile/macro-issue2092.rs b/gcc/testsuite/rust/compile/macro-issue2092.rs
new file mode 100644
index 0000000..ec20743
--- /dev/null
+++ b/gcc/testsuite/rust/compile/macro-issue2092.rs
@@ -0,0 +1,4 @@
+macro_rules! foo {
+ // { dg-error "does not take a separator" "#2092" { target *-*-*} .+1 }
+ ($(a),?) => {};
+}