aboutsummaryrefslogtreecommitdiff
path: root/gcc/rust
diff options
context:
space:
mode:
authorPierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>2023-03-01 18:46:33 +0100
committerCohenArthur <arthur.cohen@embecosm.com>2023-03-02 14:22:21 +0000
commitbaf5c546b59058fcc5aac430e8fbe6e99d355634 (patch)
treec8b8a05c41b28e6ef99720ad389bfffa7bfc6867 /gcc/rust
parent35ab5e3dffa21cba757ff8d128726e80fe588057 (diff)
downloadgcc-baf5c546b59058fcc5aac430e8fbe6e99d355634.zip
gcc-baf5c546b59058fcc5aac430e8fbe6e99d355634.tar.gz
gcc-baf5c546b59058fcc5aac430e8fbe6e99d355634.tar.bz2
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 <pierre-emmanuel.patry@embecosm.com>
Diffstat (limited to 'gcc/rust')
-rw-r--r--gcc/rust/parse/rust-parse-impl.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/gcc/rust/parse/rust-parse-impl.h b/gcc/rust/parse/rust-parse-impl.h
index 15effaa..b17744f 100644
--- a/gcc/rust/parse/rust-parse-impl.h
+++ b/gcc/rust/parse/rust-parse-impl.h
@@ -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 ();