]> git.ipfire.org Git - people/ms/gcc.git/commitdiff
parser: Add 0 sized slice pattern parsing
authorPierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
Wed, 1 Mar 2023 17:46:33 +0000 (18:46 +0100)
committerCohenArthur <arthur.cohen@embecosm.com>
Thu, 2 Mar 2023 14:22:21 +0000 (14:22 +0000)
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 <pierre-emmanuel.patry@embecosm.com>
gcc/rust/parse/rust-parse-impl.h
gcc/testsuite/rust/compile/zero_sized_slice.rs [new file with mode: 0644]

index 15effaa1979e9f68174c3c128067009d173dca1b..b17744fedaad6a0ec24bd4a950ea1428e323e08d 100644 (file)
@@ -11136,8 +11136,16 @@ std::unique_ptr<AST::SlicePattern>
 Parser<ManagedTokenSource>::parse_slice_pattern ()
 {
   Location square_locus = lexer.peek_token ()->get_locus ();
+  std::vector<std::unique_ptr<AST::Pattern>> patterns;
   skip_token (LEFT_SQUARE);
 
+  if (lexer.peek_token ()->get_id () == RIGHT_SQUARE)
+    {
+      skip_token (RIGHT_SQUARE);
+      return std::unique_ptr<AST::SlicePattern> (
+       new AST::SlicePattern (std::move (patterns), square_locus));
+    }
+
   // parse initial pattern (required)
   std::unique_ptr<AST::Pattern> initial_pattern = parse_pattern ();
   if (initial_pattern == nullptr)
@@ -11149,7 +11157,6 @@ Parser<ManagedTokenSource>::parse_slice_pattern ()
       return nullptr;
     }
 
-  std::vector<std::unique_ptr<AST::Pattern>> 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 (file)
index 0000000..cd1e21e
--- /dev/null
@@ -0,0 +1,5 @@
+// { dg-options "-fsyntax-only" }
+
+fn foo() {
+    let [] = [0; 0];
+}