diff options
| author | Mark Wielaard <mark@klomp.org> | 2021-06-23 18:06:35 +0200 |
|---|---|---|
| committer | Philip Herron <philip.herron@embecosm.com> | 2021-06-23 17:22:35 +0100 |
| commit | 23f622047ec24aa15b98fecbfc9376f6bafcd8cb (patch) | |
| tree | 7011e1532b856d9e3beb2062ddf2dd1d5f5c169e /gcc/rust/parse/rust-parse-impl.h | |
| parent | 4e5baf7e679a890c22804d16b99fc6794486825b (diff) | |
| download | gcc-23f622047ec24aa15b98fecbfc9376f6bafcd8cb.zip gcc-23f622047ec24aa15b98fecbfc9376f6bafcd8cb.tar.gz gcc-23f622047ec24aa15b98fecbfc9376f6bafcd8cb.tar.bz2 | |
Handle empty/unit tuple structs in the parser.
A tuple struct can be empty, in which case it is a unit tuple struct.
Handle this in Parser<ManagedTokenSource>::parse_struct by creating
a empty tuple_field vector instead of calling parse_tuple_fields.
Add a testcase to show empty tuple structs are now accepted.
Addresses: #385
Diffstat (limited to 'gcc/rust/parse/rust-parse-impl.h')
| -rw-r--r-- | gcc/rust/parse/rust-parse-impl.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gcc/rust/parse/rust-parse-impl.h b/gcc/rust/parse/rust-parse-impl.h index b4f264e..dfac00e 100644 --- a/gcc/rust/parse/rust-parse-impl.h +++ b/gcc/rust/parse/rust-parse-impl.h @@ -3980,7 +3980,12 @@ Parser<ManagedTokenSource>::parse_struct (AST::Visibility vis, lexer.skip_token (); // parse tuple fields - std::vector<AST::TupleField> tuple_fields = parse_tuple_fields (); + std::vector<AST::TupleField> tuple_fields; + // Might be empty tuple for unit tuple struct. + if (lexer.peek_token ()->get_id () == RIGHT_PAREN) + tuple_fields = std::vector<AST::TupleField> (); + else + tuple_fields = parse_tuple_fields (); // tuple parameters must have closing parenthesis if (!skip_token (RIGHT_PAREN)) |