mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #2642

Browse Source 
2642: Use name instead of ident in parser for macro 2.0 syntax r=matklad a=edwin0cheng



Co-authored-by: Edwin Cheng <edwin0cheng@gmail.com>
This commit is contained in:
bors[bot] 2019-12-22 08:05:02 +00:00 committed by GitHub
commit 436df298ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/ra_parser/src/grammar/items.rs
View File

@ -389,7 +389,7 @@ pub(crate) fn mod_item_list(p: &mut Parser) {
// macro m($i:ident) {}
fn macro_def(p: &mut Parser, m: Marker) {
p.expect(T![macro]);
p.expect(IDENT);
name_r(p, ITEM_RECOVERY_SET);
if p.at(T!['{']) {
token_tree(p);
} else if !p.at(T!['(']) {

6
crates/ra_syntax/test_data/parser/inline/ok/0147_macro_def.txt
View File

@ -2,7 +2,8 @@ SOURCE_FILE@[0; 50)
MACRO_DEF@[0; 28)
MACRO_KW@[0; 5) "macro"
WHITESPACE@[5; 6) " "
IDENT@[6; 7) "m"
NAME@[6; 7)
IDENT@[6; 7) "m"
WHITESPACE@[7; 8) " "
TOKEN_TREE@[8; 28)
L_CURLY@[8; 9) "{"
@ -27,7 +28,8 @@ SOURCE_FILE@[0; 50)
MACRO_DEF@[29; 49)
MACRO_KW@[29; 34) "macro"
WHITESPACE@[34; 35) " "
IDENT@[35; 36) "m"
NAME@[35; 36)
IDENT@[35; 36) "m"
TOKEN_TREE@[36; 49)
TOKEN_TREE@[36; 46)
L_PAREN@[36; 37) "("

3
crates/ra_syntax/test_data/parser/inline/ok/0148_pub_macro_def.txt
View File

@ -5,7 +5,8 @@ SOURCE_FILE@[0; 24)
WHITESPACE@[3; 4) " "
MACRO_KW@[4; 9) "macro"
WHITESPACE@[9; 10) " "
IDENT@[10; 11) "m"
NAME@[10; 11)
IDENT@[10; 11) "m"
TOKEN_TREE@[11; 23)
TOKEN_TREE@[11; 20)
L_PAREN@[11; 12) "("

6
crates/ra_syntax/test_data/parser/ok/0062_macro_2.0.txt
View File

@ -2,7 +2,8 @@ SOURCE_FILE@[0; 349)
MACRO_DEF@[0; 93)
MACRO_KW@[0; 5) "macro"
WHITESPACE@[5; 6) " "
IDENT@[6; 21) "parse_use_trees"
NAME@[6; 21)
IDENT@[6; 21) "parse_use_trees"
TOKEN_TREE@[21; 93)
TOKEN_TREE@[21; 41)
L_PAREN@[21; 22) "("
@ -75,7 +76,8 @@ SOURCE_FILE@[0; 349)
MACRO_DEF@[134; 346)
MACRO_KW@[134; 139) "macro"
WHITESPACE@[139; 140) " "
IDENT@[140; 150) "test_merge"
NAME@[140; 150)
IDENT@[140; 150) "test_merge"
TOKEN_TREE@[150; 346)
TOKEN_TREE@[150; 203)
L_PAREN@[150; 151) "("