From 8e22742c9ad844d5e6dd348f6f7d8fa2ef064de4 Mon Sep 17 00:00:00 2001 From: Arthur Cohen Date: Tue, 14 Jun 2022 13:21:14 +0200 Subject: parser: Error out if the order of lifetimes and generic types is incorrect --- gcc/rust/parse/rust-parse-impl.h | 20 ++++++++++++++++++-- gcc/testsuite/rust/compile/generics13.rs | 1 + 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/rust/compile/generics13.rs (limited to 'gcc') diff --git a/gcc/rust/parse/rust-parse-impl.h b/gcc/rust/parse/rust-parse-impl.h index 0fd381c..ce68c16 100644 --- a/gcc/rust/parse/rust-parse-impl.h +++ b/gcc/rust/parse/rust-parse-impl.h @@ -2892,19 +2892,35 @@ Parser::parse_generic_params (EndTokenPred is_end_token) * parsed but it turns out to be type param */ AST::Attribute parsed_outer_attr = AST::Attribute::create_empty (); + // Did we parse a generic type param yet + auto type_seen = false; + // Did the user write a lifetime parameter after a type one + auto order_error = false; + // parse lifetime params while (!is_end_token (lexer.peek_token ()->get_id ())) { auto param = parse_generic_param (is_end_token); if (param) { + // TODO: Handle `Const` here as well if necessary + if (param->get_kind () == AST::GenericParam::Kind::Type) + type_seen = true; + else if (param->get_kind () == AST::GenericParam::Kind::Lifetime + && type_seen) + order_error = true; + generic_params.emplace_back (std::move (param)); maybe_skip_token (COMMA); } - - // error out if lifetime after type } + // FIXME: Add reordering hint + if (order_error) + rust_error_at (generic_params.front ()->get_locus (), + "invalid order for generic parameters: lifetimes should " + "always come before types"); + generic_params.shrink_to_fit (); return generic_params; } diff --git a/gcc/testsuite/rust/compile/generics13.rs b/gcc/testsuite/rust/compile/generics13.rs new file mode 100644 index 0000000..05c75c5 --- /dev/null +++ b/gcc/testsuite/rust/compile/generics13.rs @@ -0,0 +1 @@ +struct Foo; // { dg-error "invalid order for generic parameters: lifetimes should always come before types" } -- cgit v1.1