From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id F031E3858417; Sun, 5 Mar 2023 11:42:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F031E3858417 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1678016524; bh=fNYyqNrmtaTPfje3f37X9ND4+4cau81/VgJsMAG6sJs=; h=From:To:Subject:Date:From; b=NUiZsu2h7719r7m49Q7/jo4jzrbwM6OUu4/oXtaojyFCpxRjOvddBCG3MTLO2FQxr GTqt627Ul8jl8fTwSWgaZRx6B3YDUr8GVy2Lv1mGua9Mb3k6d8YXEdzLxrPABLac8O 6p0ZRM8lczOpkgApMiwlZTc+OSR3RsGpKEV9/bsk= 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: Add 0 sized slice pattern parsing X-Act-Checkin: gcc X-Git-Author: Pierre-Emmanuel Patry X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: 35ab5e3dffa21cba757ff8d128726e80fe588057 X-Git-Newrev: baf5c546b59058fcc5aac430e8fbe6e99d355634 Message-Id: <20230305114204.F031E3858417@sourceware.org> Date: Sun, 5 Mar 2023 11:42:04 +0000 (GMT) List-Id: https://gcc.gnu.org/g:baf5c546b59058fcc5aac430e8fbe6e99d355634 commit baf5c546b59058fcc5aac430e8fbe6e99d355634 Author: Pierre-Emmanuel Patry Date: Wed Mar 1 18:46:33 2023 +0100 parser: Add 0 sized slice pattern parsing Check for a closing square bracket before attempting to parse any pattern within a slice. Also add a new test to verify zero sized slice parsing. gcc/rust/ChangeLog: * parse/rust-parse-impl.h (Parser::parse_slice_pattern): Add closing square bracket check. gcc/testsuite/ChangeLog: * rust/compile/zero_sized_slice.rs: New test. Signed-off-by: Pierre-Emmanuel Patry Diff: --- gcc/rust/parse/rust-parse-impl.h | 9 ++++++++- gcc/testsuite/rust/compile/zero_sized_slice.rs | 5 +++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/gcc/rust/parse/rust-parse-impl.h b/gcc/rust/parse/rust-parse-impl.h index 15effaa1979..b17744fedaa 100644 --- a/gcc/rust/parse/rust-parse-impl.h +++ b/gcc/rust/parse/rust-parse-impl.h @@ -11136,8 +11136,16 @@ std::unique_ptr Parser::parse_slice_pattern () { Location square_locus = lexer.peek_token ()->get_locus (); + std::vector> patterns; skip_token (LEFT_SQUARE); + if (lexer.peek_token ()->get_id () == RIGHT_SQUARE) + { + skip_token (RIGHT_SQUARE); + return std::unique_ptr ( + new AST::SlicePattern (std::move (patterns), square_locus)); + } + // parse initial pattern (required) std::unique_ptr initial_pattern = parse_pattern (); if (initial_pattern == nullptr) @@ -11149,7 +11157,6 @@ Parser::parse_slice_pattern () return nullptr; } - std::vector> patterns; patterns.push_back (std::move (initial_pattern)); const_TokenPtr t = lexer.peek_token (); diff --git a/gcc/testsuite/rust/compile/zero_sized_slice.rs b/gcc/testsuite/rust/compile/zero_sized_slice.rs new file mode 100644 index 00000000000..cd1e21e7b33 --- /dev/null +++ b/gcc/testsuite/rust/compile/zero_sized_slice.rs @@ -0,0 +1,5 @@ +// { dg-options "-fsyntax-only" } + +fn foo() { + let [] = [0; 0]; +}