Skip to content

Parse unsafe extern block #6606

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 23, 2020
Merged

Parse unsafe extern block #6606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion crates/parser/src/grammar/items.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ pub(super) fn maybe_item(p: &mut Parser, m: Marker) -> Result<(), Marker> {
has_mods = true;
}

if p.at(T![extern]) {
if p.at(T![extern]) && p.nth(1) != T!['{'] && (p.nth(1) != STRING || p.nth(2) != T!['{']) {
has_mods = true;
abi(p);
}
Expand Down Expand Up @@ -181,6 +181,14 @@ pub(super) fn maybe_item(p: &mut Parser, m: Marker) -> Result<(), Marker> {
T![type] => {
type_alias(p, m);
}

// unsafe extern "C" {}
T![extern] => {
abi(p);
extern_item_list(p);
m.complete(p, EXTERN_BLOCK);
}

_ => {
if !has_visibility && !has_mods {
return Err(m);
Expand Down
16 changes: 14 additions & 2 deletions crates/syntax/test_data/parser/ok/0068_item_modifiers.rast
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SOURCE_FILE@0..304
SOURCE_FILE@0..328
FN@0..17
ASYNC_KW@0..5 "async"
WHITESPACE@5..6 " "
Expand Down Expand Up @@ -215,4 +215,16 @@ SOURCE_FILE@0..304
ASSOC_ITEM_LIST@301..303
L_CURLY@301..302 "{"
R_CURLY@302..303 "}"
WHITESPACE@303..304 "\n"
WHITESPACE@303..305 "\n\n"
EXTERN_BLOCK@305..327
UNSAFE_KW@305..311 "unsafe"
WHITESPACE@311..312 " "
ABI@312..324
EXTERN_KW@312..318 "extern"
WHITESPACE@318..319 " "
STRING@319..324 "\"C++\""
WHITESPACE@324..325 " "
EXTERN_ITEM_LIST@325..327
L_CURLY@325..326 "{"
R_CURLY@326..327 "}"
WHITESPACE@327..328 "\n"
2 changes: 2 additions & 0 deletions crates/syntax/test_data/parser/ok/0068_item_modifiers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ unsafe auto trait T {}
unsafe impl Foo {}
default impl Foo {}
unsafe default impl Foo {}

unsafe extern "C++" {}