From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 060DD3858D32; Sat, 11 Feb 2023 15:30:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 060DD3858D32 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1676129412; bh=44aFIRrMzebrKlotf56pion4fAsqj6h2pMd3UgjTnIg=; h=From:To:Subject:Date:From; b=G9YuNh3zhRSFtxEHeebpPdvwUxGEXMpkqa2OpeoiVMLZsaSh4/Zu3Ql1999Pb03Qs XSi0b/jQwcwYRDDyFtmax1PdUvnIzrnF/wZiaS2o9bGGQjxLH0qRwEwxni23eIm/w/ fjr4zCuBGQ8rpoSeHy5kDz3uV0j2a/yGEITvQBWA= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/rust/master] parser: Improve parsing of complex generic arguments X-Act-Checkin: gcc X-Git-Author: Arthur Cohen X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: 776c4247de465dd93438a738fff48d5b2076ec11 X-Git-Newrev: d60022770403ee3799644fb3832cbdd0d721e0f7 Message-Id: <20230211153012.060DD3858D32@sourceware.org> Date: Sat, 11 Feb 2023 15:30:12 +0000 (GMT) List-Id: https://gcc.gnu.org/g:d60022770403ee3799644fb3832cbdd0d721e0f7 commit d60022770403ee3799644fb3832cbdd0d721e0f7 Author: Arthur Cohen Date: Wed Feb 1 12:41:47 2023 +0100 parser: Improve parsing of complex generic arguments The parser was missing code for handling complex type arguments such as type paths or nested generics. gcc/rust/ChangeLog: * parse/rust-parse-impl.h (Parser::parse_generic_arg): Handle type paths and nested generics properly. gcc/testsuite/ChangeLog: * rust/compile/parse_complex_generic_application.rs: New test. * rust/compile/parse_complex_generic_application2.rs: New test. Diff: --- gcc/rust/parse/rust-parse-impl.h | 4 +++- .../rust/compile/parse_complex_generic_application.rs | 17 +++++++++++++++++ .../rust/compile/parse_complex_generic_application2.rs | 10 ++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/gcc/rust/parse/rust-parse-impl.h b/gcc/rust/parse/rust-parse-impl.h index f60d34fdb94..b4c959e6684 100644 --- a/gcc/rust/parse/rust-parse-impl.h +++ b/gcc/rust/parse/rust-parse-impl.h @@ -6309,7 +6309,9 @@ Parser::parse_generic_arg () // could either have a valid type or a macro (FIXME: anything else?). So // we need one bit of lookahead to differentiate if this is really auto next_tok = lexer.peek_token (1); - if (next_tok->get_id () == EXCLAM) + if (next_tok->get_id () == LEFT_ANGLE + || next_tok->get_id () == SCOPE_RESOLUTION + || next_tok->get_id () == EXCLAM) { auto type = parse_type (); if (type) diff --git a/gcc/testsuite/rust/compile/parse_complex_generic_application.rs b/gcc/testsuite/rust/compile/parse_complex_generic_application.rs new file mode 100644 index 00000000000..d5c7bf488b7 --- /dev/null +++ b/gcc/testsuite/rust/compile/parse_complex_generic_application.rs @@ -0,0 +1,17 @@ +pub enum Either { + Left(T), + Right(E), +} + +pub mod err { + pub struct Error; + pub struct ErrorWrap(T); +} + +pub fn foo_err() -> Either<(), err::Error> { + Either::Left(()) +} + +pub fn foo_err_wrap() -> Either<(), err::ErrorWrap> { + Either::Left(()) +} diff --git a/gcc/testsuite/rust/compile/parse_complex_generic_application2.rs b/gcc/testsuite/rust/compile/parse_complex_generic_application2.rs new file mode 100644 index 00000000000..0361931c50c --- /dev/null +++ b/gcc/testsuite/rust/compile/parse_complex_generic_application2.rs @@ -0,0 +1,10 @@ +pub enum Either { + Left(L), + Right(R), +} + +pub struct Wrap(T); + +pub fn foo_wrap() -> Either<(), Wrap> { + Either::Left(()) +}