Skip to content
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

Jump to bottom

Rust: allow arrays in function parameters #2612

Merged
merged 1 commit into from Aug 9, 2020
Merged

Rust: allow arrays in function parameters #2612

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions Units/parser-rust.r/rust-test_input.d/expected.tags
View file
Open in desktop
Expand Up @@ -24,6 +24,7 @@ a_anteater input.rs /^ a_anteater(isize),$/;" e enum:Animal
a_bear input.rs /^ a_bear(isize),$/;" e enum:Animal
a_cat input.rs /^ a_cat(isize),$/;" e enum:Animal
a_dog input.rs /^ a_dog(isize),$/;" e enum:Animal
array_param input.rs /^fn array_param(arr: [[u32; 3]; 4])$/;" f signature:(arr: [[u32; 3]; 4])
bar input.rs /^ bar: isize$/;" m struct:A
bar input.rs /^ bar: isize$/;" m struct:B
do_z input.rs /^ fn do_z(&self) {$/;" P implementation:Foo signature:(&self)
Expand Down
4 changes: 4 additions & 0 deletions Units/parser-rust.r/rust-test_input.d/input.rs
View file
Open in desktop
Expand Up @@ -47,6 +47,10 @@ pub fn where_foo<T>(a: T) where T: Send
{
}

fn array_param(arr: [[u32; 3]; 4])
{
}

/*
* fn ignored_in_comment() {}
*/
Expand Down
19 changes: 16 additions & 3 deletions parsers/rust.c
View file
Open in desktop
Expand Up @@ -528,6 +528,7 @@ static void parseFn (lexerState *lexer, vString *scope, int parent_kind)
unsigned long line;
MIOPos pos;
int paren_level = 0;
int bracket_level = 0;
bool found_paren = false;
bool valid_signature = true;

Expand All @@ -545,9 +546,13 @@ static void parseFn (lexerState *lexer, vString *scope, int parent_kind)

/* HACK: This is a bit coarse as far as what tag entry means by
* 'arglist'... */
while (lexer->cur_token != '{' && lexer->cur_token != ';')
while (lexer->cur_token != '{')
{
if (lexer->cur_token == '}')
if (lexer->cur_token == ';' && bracket_level == 0)
{
break;
}
else if (lexer->cur_token == '}')
{
valid_signature = false;
break;
Expand All @@ -566,6 +571,14 @@ static void parseFn (lexerState *lexer, vString *scope, int parent_kind)
break;
}
}
else if (lexer->cur_token == '[')
{
bracket_level++;
}
else if (lexer->cur_token == ']')
{
bracket_level--;
}
else if (lexer->cur_token == TOKEN_EOF)
{
valid_signature = false;
Expand All @@ -574,7 +587,7 @@ static void parseFn (lexerState *lexer, vString *scope, int parent_kind)
writeCurTokenToStr(lexer, arg_list);
advanceToken(lexer, false);
}
if (!found_paren || paren_level != 0)
if (!found_paren || paren_level != 0 || bracket_level != 0)
valid_signature = false;

if (valid_signature)
Expand Down