Skip to content

Commit 695b601

Browse files
CentrilCentril
committed
Update tests since ? macro op is supported on 2015.
1 parent 51b9dc3 commit 695b601

12 files changed

+185
-87
lines changed

‎src/test/run-pass/macros/macro-at-most-once-rep-2015.rs

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
// run-pass
2+
#![allow(unused_mut)]
3+
// The logic for parsing Kleene operators in macros has a special case to disambiguate `?`.
4+
// Specifically, `$(pat)?` is the ZeroOrOne operator whereas `$(pat)?+` or `$(pat)?*` are the
5+
// ZeroOrMore and OneOrMore operators using `?` as a separator. These tests are intended to
6+
// exercise that logic in the macro parser.
7+
//
8+
// Moreover, we also throw in some tests for using a separator with `?`, which is meaningless but
9+
// included for consistency with `+` and `*`.
10+
//
11+
// This test focuses on non-error cases and making sure the correct number of repetitions happen.
12+
13+
// edition:2015
14+
15+
macro_rules! foo {
16+
($($a:ident)? ; $num:expr) => { {
17+
let mut x = 0;
18+
19+
$(
20+
x += $a;
21+
)?
22+
23+
assert_eq!(x, $num);
24+
} }
25+
}
26+
27+
pub fn main() {
28+
let a = 1;
29+
30+
// accept 0 or 1 repetitions
31+
foo!( ; 0);
32+
foo!(a ; 1);
33+
}

‎src/test/run-pass/macros/macro-at-most-once-rep.rs ‎src/test/run-pass/macros/macro-at-most-once-rep-2018.rs

File renamed without changes.

‎src/test/ui/issues/issue-39388.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#![allow(unused_macros)]
22

33
macro_rules! assign {
4-
(($($a:tt)*) = ($($b:tt))*) => { //~ ERROR expected `*` or `+`
4+
(($($a:tt)*) = ($($b:tt))*) => { //~ ERROR expected one of: `*`, `+`, or `?`
55
$($a)* = $($b)*
66
}
77
}

‎src/test/ui/issues/issue-39388.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error: expected `*` or `+`
1+
error: expected one of: `*`, `+`, or `?`
22
--> $DIR/issue-39388.rs:4:22
33
|
44
LL | (($($a:tt)*) = ($($b:tt))*) => {

‎src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep.rs

-13
This file was deleted.

‎src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep.stderr

-18
This file was deleted.

‎src/test/ui/macros/macro-at-most-once-rep-2015-ques-sep.rs

-28
This file was deleted.

‎src/test/ui/macros/macro-at-most-once-rep-2015-ques-sep.stderr

-24
This file was deleted.

‎src/test/ui/macros/macro-at-most-once-rep-2015.rs

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
// Tests that `?` is a Kleene op and not a macro separator in the 2015 edition.
2+
3+
// edition:2015
4+
5+
macro_rules! foo {
6+
($(a)?) => {};
7+
}
8+
9+
macro_rules! baz {
10+
($(a),?) => {}; //~ERROR the `?` macro repetition operator
11+
}
12+
13+
macro_rules! barplus {
14+
($(a)?+) => {}; // ok. matches "a+" and "+"
15+
}
16+
17+
macro_rules! barstar {
18+
($(a)?*) => {}; // ok. matches "a*" and "*"
19+
}
20+
21+
pub fn main() {
22+
foo!();
23+
foo!(a);
24+
foo!(a?); //~ ERROR no rules expected the token `?`
25+
foo!(a?a); //~ ERROR no rules expected the token `?`
26+
foo!(a?a?a); //~ ERROR no rules expected the token `?`
27+
28+
barplus!(); //~ERROR unexpected end of macro invocation
29+
barplus!(a); //~ERROR unexpected end of macro invocation
30+
barplus!(a?); //~ ERROR no rules expected the token `?`
31+
barplus!(a?a); //~ ERROR no rules expected the token `?`
32+
barplus!(a+);
33+
barplus!(+);
34+
35+
barstar!(); //~ERROR unexpected end of macro invocation
36+
barstar!(a); //~ERROR unexpected end of macro invocation
37+
barstar!(a?); //~ ERROR no rules expected the token `?`
38+
barstar!(a?a); //~ ERROR no rules expected the token `?`
39+
barstar!(a*);
40+
barstar!(*);
41+
}

‎src/test/ui/macros/macro-at-most-once-rep-2015.stderr

+107
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
error: the `?` macro repetition operator does not take a separator
2+
--> $DIR/macro-at-most-once-rep-2015.rs:10:10
3+
|
4+
LL | ($(a),?) => {};
5+
| ^
6+
7+
error: no rules expected the token `?`
8+
--> $DIR/macro-at-most-once-rep-2015.rs:24:11
9+
|
10+
LL | macro_rules! foo {
11+
| ---------------- when calling this macro
12+
...
13+
LL | foo!(a?);
14+
| ^ no rules expected this token in macro call
15+
16+
error: no rules expected the token `?`
17+
--> $DIR/macro-at-most-once-rep-2015.rs:25:11
18+
|
19+
LL | macro_rules! foo {
20+
| ---------------- when calling this macro
21+
...
22+
LL | foo!(a?a);
23+
| ^ no rules expected this token in macro call
24+
25+
error: no rules expected the token `?`
26+
--> $DIR/macro-at-most-once-rep-2015.rs:26:11
27+
|
28+
LL | macro_rules! foo {
29+
| ---------------- when calling this macro
30+
...
31+
LL | foo!(a?a?a);
32+
| ^ no rules expected this token in macro call
33+
34+
error: unexpected end of macro invocation
35+
--> $DIR/macro-at-most-once-rep-2015.rs:28:5
36+
|
37+
LL | macro_rules! barplus {
38+
| -------------------- when calling this macro
39+
...
40+
LL | barplus!();
41+
| ^^^^^^^^^^^ missing tokens in macro arguments
42+
43+
error: unexpected end of macro invocation
44+
--> $DIR/macro-at-most-once-rep-2015.rs:29:15
45+
|
46+
LL | macro_rules! barplus {
47+
| -------------------- when calling this macro
48+
...
49+
LL | barplus!(a);
50+
| ^ missing tokens in macro arguments
51+
52+
error: no rules expected the token `?`
53+
--> $DIR/macro-at-most-once-rep-2015.rs:30:15
54+
|
55+
LL | macro_rules! barplus {
56+
| -------------------- when calling this macro
57+
...
58+
LL | barplus!(a?);
59+
| ^ no rules expected this token in macro call
60+
61+
error: no rules expected the token `?`
62+
--> $DIR/macro-at-most-once-rep-2015.rs:31:15
63+
|
64+
LL | macro_rules! barplus {
65+
| -------------------- when calling this macro
66+
...
67+
LL | barplus!(a?a);
68+
| ^ no rules expected this token in macro call
69+
70+
error: unexpected end of macro invocation
71+
--> $DIR/macro-at-most-once-rep-2015.rs:35:5
72+
|
73+
LL | macro_rules! barstar {
74+
| -------------------- when calling this macro
75+
...
76+
LL | barstar!();
77+
| ^^^^^^^^^^^ missing tokens in macro arguments
78+
79+
error: unexpected end of macro invocation
80+
--> $DIR/macro-at-most-once-rep-2015.rs:36:15
81+
|
82+
LL | macro_rules! barstar {
83+
| -------------------- when calling this macro
84+
...
85+
LL | barstar!(a);
86+
| ^ missing tokens in macro arguments
87+
88+
error: no rules expected the token `?`
89+
--> $DIR/macro-at-most-once-rep-2015.rs:37:15
90+
|
91+
LL | macro_rules! barstar {
92+
| -------------------- when calling this macro
93+
...
94+
LL | barstar!(a?);
95+
| ^ no rules expected this token in macro call
96+
97+
error: no rules expected the token `?`
98+
--> $DIR/macro-at-most-once-rep-2015.rs:38:15
99+
|
100+
LL | macro_rules! barstar {
101+
| -------------------- when calling this macro
102+
...
103+
LL | barstar!(a?a);
104+
| ^ no rules expected this token in macro call
105+
106+
error: aborting due to 12 previous errors
107+

‎src/test/ui/parser/macro/issue-33569.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
macro_rules! foo {
22
{ $+ } => { //~ ERROR expected identifier, found `+`
33
//~^ ERROR missing fragment specifier
4-
$(x)(y) //~ ERROR expected `*` or `+`
4+
$(x)(y) //~ ERROR expected one of: `*`, `+`, or `?`
55
}
66
}
77

‎src/test/ui/parser/macro/issue-33569.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: expected identifier, found `+`
44
LL | { $+ } => {
55
| ^
66

7-
error: expected `*` or `+`
7+
error: expected one of: `*`, `+`, or `?`
88
--> $DIR/issue-33569.rs:4:13
99
|
1010
LL | $(x)(y)

0 commit comments

Comments
 (0)