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

Support macro calls in type position

Browse Source
This commit is contained in:
Erlend Tobiassen 2019-01-25 23:56:31 +01:00
parent dc5ecf4469
commit e28bd099d6
No known key found for this signature in database
GPG Key ID: B48B8536A8F585B2
3 changed files with 68 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
crates/ra_syntax/src/grammar/types.rs
View File

@ -29,7 +29,7 @@ fn type_with_bounds_cond(p: &mut Parser, allow_bounds: bool) {
DYN_KW => dyn_trait_type(p),
// Some path types are not allowed to have bounds (no plus)
L_ANGLE => path_type_(p, allow_bounds),
_ if paths::is_path_start(p) => path_type_(p, allow_bounds),
_ if paths::is_path_start(p) => path_or_macro_type_(p, allow_bounds),
_ => {
p.err_recover("expected type", TYPE_RECOVERY_SET);
}
@ -243,6 +243,28 @@ pub(super) fn path_type(p: &mut Parser) {
path_type_(p, true)
}
// test macro_call_type
// type A = foo!();
// type B = crate::foo!();
fn path_or_macro_type_(p: &mut Parser, allow_bounds: bool) {
assert!(paths::is_path_start(p) || p.at(L_ANGLE));
let m = p.start();
paths::type_path(p);
let kind = if p.at(EXCL) {
items::macro_call_after_excl(p);
MACRO_CALL
} else {
PATH_TYPE
};
if allow_bounds && p.eat(PLUS) {
type_params::bounds_without_colon(p);
}
m.complete(p, kind);
}
pub(super) fn path_type_(p: &mut Parser, allow_bounds: bool) {
assert!(paths::is_path_start(p) || p.at(L_ANGLE));
let m = p.start();

2
crates/ra_syntax/tests/data/parser/inline/ok/0117_macro_call_type.rs Normal file
View File

@ -0,0 +1,2 @@
type A = foo!();
type B = crate::foo!();

43
crates/ra_syntax/tests/data/parser/inline/ok/0117_macro_call_type.txt Normal file
View File

@ -0,0 +1,43 @@
SOURCE_FILE@[0; 41)
TYPE_DEF@[0; 16)
TYPE_KW@[0; 4)
WHITESPACE@[4; 5)
NAME@[5; 6)
IDENT@[5; 6) "A"
WHITESPACE@[6; 7)
EQ@[7; 8)
WHITESPACE@[8; 9)
MACRO_CALL@[9; 15)
PATH@[9; 12)
PATH_SEGMENT@[9; 12)
NAME_REF@[9; 12)
IDENT@[9; 12) "foo"
EXCL@[12; 13)
TOKEN_TREE@[13; 15)
L_PAREN@[13; 14)
R_PAREN@[14; 15)
SEMI@[15; 16)
WHITESPACE@[16; 17)
TYPE_DEF@[17; 40)
TYPE_KW@[17; 21)
WHITESPACE@[21; 22)
NAME@[22; 23)
IDENT@[22; 23) "B"
WHITESPACE@[23; 24)
EQ@[24; 25)
WHITESPACE@[25; 26)
MACRO_CALL@[26; 39)
PATH@[26; 36)
PATH@[26; 31)
PATH_SEGMENT@[26; 31)
CRATE_KW@[26; 31)
COLONCOLON@[31; 33)
PATH_SEGMENT@[33; 36)
NAME_REF@[33; 36)
IDENT@[33; 36) "foo"
EXCL@[36; 37)
TOKEN_TREE@[37; 39)
L_PAREN@[37; 38)
R_PAREN@[38; 39)
SEMI@[39; 40)
WHITESPACE@[40; 41)