diff options
| -rw-r--r-- | gcc/rust/parse/rust-parse-impl.h | 7 | ||||
| -rw-r--r-- | gcc/testsuite/rust/compile/torture/tuple_enum_variants.rs | 19 |
2 files changed, 25 insertions, 1 deletions
diff --git a/gcc/rust/parse/rust-parse-impl.h b/gcc/rust/parse/rust-parse-impl.h index dfac00e..9a28f6c 100644 --- a/gcc/rust/parse/rust-parse-impl.h +++ b/gcc/rust/parse/rust-parse-impl.h @@ -4415,7 +4415,12 @@ Parser<ManagedTokenSource>::parse_enum_item () // tuple enum item lexer.skip_token (); - std::vector<AST::TupleField> tuple_fields = parse_tuple_fields (); + std::vector<AST::TupleField> tuple_fields; + // Might be empty tuple for unit tuple enum variant. + if (lexer.peek_token ()->get_id () == RIGHT_PAREN) + tuple_fields = std::vector<AST::TupleField> (); + else + tuple_fields = parse_tuple_fields (); if (!skip_token (RIGHT_PAREN)) { diff --git a/gcc/testsuite/rust/compile/torture/tuple_enum_variants.rs b/gcc/testsuite/rust/compile/torture/tuple_enum_variants.rs new file mode 100644 index 0000000..26e3e5d --- /dev/null +++ b/gcc/testsuite/rust/compile/torture/tuple_enum_variants.rs @@ -0,0 +1,19 @@ +enum E { T0(), T1(i32), T2(i32,u32) } + +/* The following doesn't parse yet... +fn f(e0: E, e1: E, e2: E) -> (E,E,E,()) +{ + let e = e0; + let f = e1; + let g = e2; + (e,f,g,()) +} + +fn main() +{ + let e0 = E::T0(); + let e1 = E::T1(0); + let e2 = E::T2(0,1); + f(e0, e1, e2).3 +} +*/ |