diff options
| author | Kushal Pal <kushalpal109@gmail.com> | 2024-01-23 17:23:05 +0530 |
|---|---|---|
| committer | CohenArthur <arthur.cohen@embecosm.com> | 2024-01-26 10:11:04 +0000 |
| commit | bef49670f6248e30ab888ecdbd52a8a1612e25ef (patch) | |
| tree | 769cbf9516ce10d8c15c918c243400ba9eeb0eec | |
| parent | 396565b34006f8b26bf9b8ea34a837bceb02c70b (diff) | |
| download | gcc-bef49670f6248e30ab888ecdbd52a8a1612e25ef.zip gcc-bef49670f6248e30ab888ecdbd52a8a1612e25ef.tar.gz gcc-bef49670f6248e30ab888ecdbd52a8a1612e25ef.tar.bz2 | |
Parse normal functions with `self` parameter correctly
Fixes #2812
gcc/rust/ChangeLog:
* parse/rust-parse-impl.h (Parser::parse_function):
Skip token if its a COMMA.
gcc/testsuite/ChangeLog:
* rust/compile/issue-2812.rs: New test.
Signed-off-by: Kushal Pal <kushalpal109@gmail.com>
| -rw-r--r-- | gcc/rust/parse/rust-parse-impl.h | 4 | ||||
| -rw-r--r-- | gcc/testsuite/rust/compile/issue-2812.rs | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/gcc/rust/parse/rust-parse-impl.h b/gcc/rust/parse/rust-parse-impl.h index d1cfa36..a43b389 100644 --- a/gcc/rust/parse/rust-parse-impl.h +++ b/gcc/rust/parse/rust-parse-impl.h @@ -2946,8 +2946,8 @@ Parser<ManagedTokenSource>::parse_function (AST::Visibility vis, && initial_param.error () != ParseSelfError::NOT_SELF) return nullptr; - if (initial_param.has_value ()) - skip_token (COMMA); + if (initial_param.has_value () && lexer.peek_token ()->get_id () == COMMA) + skip_token (); // parse function parameters (only if next token isn't right paren) std::vector<std::unique_ptr<AST::Param>> function_params; diff --git a/gcc/testsuite/rust/compile/issue-2812.rs b/gcc/testsuite/rust/compile/issue-2812.rs new file mode 100644 index 0000000..173259b --- /dev/null +++ b/gcc/testsuite/rust/compile/issue-2812.rs @@ -0,0 +1,4 @@ +// { dg-additional-options "-frust-compile-until=astvalidation" } +fn foo_1(&self); +fn foo_1(&mut self); +fn foo_1(self); |