Macros: Add a 'literal' fragment specifier #49835
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| # `macro_literal_matcher` | ||
|
|
||
| The tracking issue for this feature is: [#35625] | ||
|
|
||
| The RFC is: [rfc#1576]. | ||
|
|
||
| With this feature gate enabled, the [list of fragment specifiers][frags] gains one more entry: | ||
|
|
||
| * `literal`: a literal. Examples: 2, "string", 'c' | ||
|
|
||
| A `literal` may be followed by anything, similarly to the `ident` specifier. | ||
|
|
||
| [rfc#1576]: http://rust-lang.github.io/rfcs/1576-macros-literal-matcher.html | ||
| [#35625]: https://github.com/rust-lang/rust/issues/35625 | ||
| [frags]: ../book/first-edition/macros.html#syntactic-requirements | ||
|
|
||
| ------------------------ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,143 @@ | ||
| // Copyright 2018 The Rust Project Developers. See the COPYRIGHT | ||
| // file at the top-level directory of this distribution and at | ||
| // http://rust-lang.org/COPYRIGHT. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
| // http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
| // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your | ||
| // option. This file may not be copied, modified, or distributed | ||
| // except according to those terms. | ||
|
|
||
| #![feature(macro_literal_matcher)] | ||
|
|
||
| macro_rules! mtester { | ||
| ($l:literal) => { | ||
| &format!("macro caught literal: {}", $l) | ||
| }; | ||
| ($e:expr) => { | ||
| &format!("macro caught expr: {}", $e) | ||
| }; | ||
| } | ||
|
|
||
| macro_rules! two_negative_literals { | ||
| ($l1:literal $l2:literal) => { | ||
| &format!("macro caught literals: {}, {}", $l1, $l2) | ||
| }; | ||
| } | ||
|
|
||
| macro_rules! only_expr { | ||
| ($e:expr) => { | ||
| &format!("macro caught expr: {}", $e) | ||
| }; | ||
| } | ||
|
|
||
| macro_rules! mtester_dbg { | ||
| ($l:literal) => { | ||
| &format!("macro caught literal: {:?}", $l) | ||
| }; | ||
| ($e:expr) => { | ||
| &format!("macro caught expr: {:?}", $e) | ||
| }; | ||
| } | ||
|
|
||
| macro_rules! catch_range { | ||
| ($s:literal ... $e:literal) => { | ||
| &format!("macro caught literal: {} ... {}", $s, $e) | ||
| }; | ||
| (($s:expr) ... ($e:expr)) => { // Must use ')' before '...' | ||
| &format!("macro caught expr: {} ... {}", $s, $e) | ||
| }; | ||
| } | ||
|
|
||
| macro_rules! pat_match { | ||
| ($s:literal ... $e:literal) => { | ||
| match 3 { | ||
| $s ... $e => "literal, in range", | ||
| _ => "literal, other", | ||
| } | ||
| }; | ||
| ($s:pat) => { | ||
| match 3 { | ||
| $s => "pat, single", | ||
| _ => "pat, other", | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| macro_rules! match_attr { | ||
| (#[$attr:meta] $e:literal) => { | ||
|
There was a problem hiding this comment. I meant literal inside the attribute produced by the macro, e.g. something like macro_rules! match_attr {
($e: literal) => {
// Struct with doc comment passed via $literal
#[doc = $literal]
struct S;
}
} |
||
| "attr matched literal" | ||
| }; | ||
| (#[$attr:meta] $e:expr) => { | ||
| "attr matched expr" | ||
| }; | ||
| } | ||
|
|
||
| macro_rules! match_produced_attr { | ||
| ($lit: literal) => { | ||
| // Struct with doc comment passed via $literal | ||
| #[doc = $lit] | ||
| struct LiteralProduced; | ||
| }; | ||
| ($expr: expr) => { | ||
| struct ExprProduced; | ||
| }; | ||
| } | ||
|
|
||
| macro_rules! test_user { | ||
| ($s:literal, $e:literal) => { | ||
|
There was a problem hiding this comment. Could you add a case checking that |
||
| { | ||
| let mut v = Vec::new(); | ||
| for i in $s .. $e { | ||
| v.push(i); | ||
| } | ||
| "literal" | ||
| } | ||
| }; | ||
| ($s:expr, $e: expr) => { | ||
| { | ||
| let mut v = Vec::new(); | ||
| for i in $s .. $e { | ||
| v.push(i); | ||
| } | ||
| "expr" | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| pub fn main() { | ||
| // Cases where 'literal' catches | ||
| assert_eq!(mtester!("str"), "macro caught literal: str"); | ||
| assert_eq!(mtester!(2), "macro caught literal: 2"); | ||
| assert_eq!(mtester!(2.2), "macro caught literal: 2.2"); | ||
| assert_eq!(mtester!(1u32), "macro caught literal: 1"); | ||
| assert_eq!(mtester!(0x32), "macro caught literal: 50"); | ||
| assert_eq!(mtester!('c'), "macro caught literal: c"); | ||
| assert_eq!(mtester!(-1.2), "macro caught literal: -1.2"); | ||
| assert_eq!(two_negative_literals!(-2 -3), "macro caught literals: -2, -3"); | ||
| assert_eq!(catch_range!(2 ... 3), "macro caught literal: 2 ... 3"); | ||
| assert_eq!(match_attr!(#[attr] 1), "attr matched literal"); | ||
| assert_eq!(test_user!(10, 20), "literal"); | ||
| assert_eq!(mtester!(false), "macro caught literal: false"); | ||
| assert_eq!(mtester!(true), "macro caught literal: true"); | ||
| match_produced_attr!("a"); | ||
| let _a = LiteralProduced; | ||
| assert_eq!(pat_match!(1 ... 3), "literal, in range"); | ||
| assert_eq!(pat_match!(4 ... 6), "literal, other"); | ||
|
|
||
| // Cases where 'expr' catches | ||
| assert_eq!(mtester!((-1.2)), "macro caught expr: -1.2"); | ||
| assert_eq!(only_expr!(-1.2), "macro caught expr: -1.2"); | ||
| assert_eq!(mtester!((1 + 3)), "macro caught expr: 4"); | ||
| assert_eq!(mtester_dbg!(()), "macro caught expr: ()"); | ||
| assert_eq!(catch_range!((1 + 1) ... (2 + 2)), "macro caught expr: 2 ... 4"); | ||
| assert_eq!(match_attr!(#[attr] (1 + 2)), "attr matched expr"); | ||
| assert_eq!(test_user!(10, (20 + 2)), "expr"); | ||
|
|
||
| match_produced_attr!((3 + 2)); | ||
| let _b = ExprProduced; | ||
|
|
||
| // Cases where 'pat' matched | ||
| assert_eq!(pat_match!(3), "pat, single"); | ||
| assert_eq!(pat_match!(6), "pat, other"); | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Similarly to attributes, the range should rather be produced by a macro (1833a1f#r184891034), this test with
...on the left side of the macro is testing something entirely different and probably not useful.