squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Merge #7027

Browse source 
7027: Fix macro_rules not accepting brackets or parentheses r=matklad,lnicola a=Veykril



Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
This commit is contained in:
bors[bot] 2020-12-24 08:44:52 +00:00 committed by GitHub
commit 1487f2f10e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 66 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
crates/parser/src/grammar/items.rs
View file

@ -389,10 +389,15 @@ fn macro_rules(p: &mut Parser, m: Marker) {
}
match p.current() {
T!['{'] => {
// test macro_rules_non_brace
// macro_rules! m ( ($i:ident) => {} );
// macro_rules! m [ ($i:ident) => {} ];
T!['['] | T!['('] => {
token_tree(p);
p.expect(T![;]);
}
_ => p.error("expected `{`"),
T!['{'] => token_tree(p),
_ => p.error("expected `{`, `[`, `(`"),
}
m.complete(p, MACRO_RULES);
}

57
crates/syntax/test_data/parser/inline/ok/0158_macro_rules_non_brace.rast Normal file
View file

@ -0,0 +1,57 @@
SOURCE_FILE@0..74
MACRO_RULES@0..36
MACRO_RULES_KW@0..11 "macro_rules"
BANG@11..12 "!"
WHITESPACE@12..13 " "
NAME@13..14
IDENT@13..14 "m"
WHITESPACE@14..15 " "
TOKEN_TREE@15..35
L_PAREN@15..16 "("
WHITESPACE@16..17 " "
TOKEN_TREE@17..27
L_PAREN@17..18 "("
DOLLAR@18..19 "$"
IDENT@19..20 "i"
COLON@20..21 ":"
IDENT@21..26 "ident"
R_PAREN@26..27 ")"
WHITESPACE@27..28 " "
EQ@28..29 "="
R_ANGLE@29..30 ">"
WHITESPACE@30..31 " "
TOKEN_TREE@31..33
L_CURLY@31..32 "{"
R_CURLY@32..33 "}"
WHITESPACE@33..34 " "
R_PAREN@34..35 ")"
SEMICOLON@35..36 ";"
WHITESPACE@36..37 "\n"
MACRO_RULES@37..73
MACRO_RULES_KW@37..48 "macro_rules"
BANG@48..49 "!"
WHITESPACE@49..50 " "
NAME@50..51
IDENT@50..51 "m"
WHITESPACE@51..52 " "
TOKEN_TREE@52..72
L_BRACK@52..53 "["
WHITESPACE@53..54 " "
TOKEN_TREE@54..64
L_PAREN@54..55 "("
DOLLAR@55..56 "$"
IDENT@56..57 "i"
COLON@57..58 ":"
IDENT@58..63 "ident"
R_PAREN@63..64 ")"
WHITESPACE@64..65 " "
EQ@65..66 "="
R_ANGLE@66..67 ">"
WHITESPACE@67..68 " "
TOKEN_TREE@68..70
L_CURLY@68..69 "{"
R_CURLY@69..70 "}"
WHITESPACE@70..71 " "
R_BRACK@71..72 "]"
SEMICOLON@72..73 ";"
WHITESPACE@73..74 "\n"

2
crates/syntax/test_data/parser/inline/ok/0158_macro_rules_non_brace.rs Normal file
View file

@ -0,0 +1,2 @@
macro_rules! m ( ($i:ident) => {} );
macro_rules! m [ ($i:ident) => {} ];