[gcc r14-8056] gccrs: Break OR tokens in closure parameter list context
Arthur Cohen
cohenarthur@gcc.gnu.org
Tue Jan 16 18:14:48 GMT 2024
https://gcc.gnu.org/g:906e55530a30fed93868d16332c9168848089ded
commit r14-8056-g906e55530a30fed93868d16332c9168848089ded
Author: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
Date: Tue Oct 10 14:06:30 2023 +0200
gccrs: Break OR tokens in closure parameter list context
The parser was unable to process as closure inside a closure because the
lexer could not differentiate an OR from two PIPE tokens.
gcc/rust/ChangeLog:
* parse/rust-parse-impl.h (Parser::parse_closure_expr_pratt): Fix
closure parsing function to handle consecutive parameter lists.
Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
Diff:
---
gcc/rust/parse/rust-parse-impl.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/gcc/rust/parse/rust-parse-impl.h b/gcc/rust/parse/rust-parse-impl.h
index 71f76f8e2eb..1e59913e88e 100644
--- a/gcc/rust/parse/rust-parse-impl.h
+++ b/gcc/rust/parse/rust-parse-impl.h
@@ -14464,12 +14464,17 @@ Parser<ManagedTokenSource>::parse_closure_expr_pratt (const_TokenPtr tok,
if (lexer.peek_token ()->get_id () != COMMA)
{
+ if (lexer.peek_token ()->get_id () == OR)
+ lexer.split_current_token (PIPE, PIPE);
// not an error but means param list is done
break;
}
// skip comma
lexer.skip_token ();
+ if (lexer.peek_token ()->get_id () == OR)
+ lexer.split_current_token (PIPE, PIPE);
+
t = lexer.peek_token ();
}
More information about the Gcc-cvs
mailing list