From: Mark Wielaard <mark@klomp.org>
To: Philip Herron <philip.herron@embecosm.com>
Cc: gcc-rust@gcc.gnu.org
Subject: Re: [PATCH] Pass pratt parsed token to expr parser functions to fix expr locus
Date: Sat, 7 Aug 2021 03:01:39 +0200 [thread overview]
Message-ID: <YQ3bc95TCaP7z2RG@wildebeest.org> (raw)
In-Reply-To: <32bcf8f9-881e-d57f-470e-5f48fe78e200@embecosm.com>
[-- Attachment #1: Type: text/plain, Size: 1790 bytes --]
On Fri, Aug 06, 2021 at 04:23:27PM +0100, Philip Herron wrote:
> On 05/08/2021 20:37, Mark Wielaard wrote:
> > Hi,
> >
> > On Fri, Jul 30, 2021 at 03:03:13AM +0200, Mark Wielaard wrote:
> >> That variant is attached and can also be found here:
> >> https://code.wildebeest.org/git/user/mjw/gccrs/commit/?h=pass-pratt-parse-loc
> >> The original is also here:
> >> https://code.wildebeest.org/git/user/mjw/gccrs/commit/?h=pass-pratt-parse-token
> >>
> >> Hopefully one of the two is acceptable. If not please let me know how
> >> to rewrite it in a cheaper more idiomatic way.
> > Any feedback on these patches? I really like to get the locations
> > correct for these pratt parsed expressions. If both variants are
> > problematic please let me know what I can do to improve them.
> >
> > Thanks,
> >
> > Mark
> >
> Hi Mark,
>
> Sorry for lack of reply on this. After looking into this and also
> getting Arthur Cohen to review, I think:
>
> * Token passing: If we end up using the token for more than the
> location this might be useful but at present I can't think of a
> use-case for the token. If we do need it maybe we could look into
> passing it by reference.
> * Location passing: I think this is the best solution and is directly
> associated with the issue you have fixed. The function says that you
> can call me but tell me the location as well so its up to the caller
> to handle this. We should add a comment to the function prototypes
> to say what the location is but that's it.
>
> What do you think?
OK, lets go with the location passing. I added a comment to the
function prototypes in rust-parse.h about the passed in
pratt_parsed_token.
https://code.wildebeest.org/git/user/mjw/gccrs/commit/?h=pass-pratt-parse-token
Cheers,
Mark
[-- Attachment #2: 0001-Pass-pratt-parsed-token-to-expr-parser-functions-to-.patch --]
[-- Type: text/x-diff, Size: 22762 bytes --]
From 1c139cbaa71c2928ca747fa26dc776699937280a Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark@klomp.org>
Date: Thu, 29 Jul 2021 00:00:55 +0200
Subject: [PATCH] Pass pratt parsed token to expr parser functions to fix expr
locus
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The pratt parser skips the first token of an expression before
invoking the actual expression parsing function. This makes getting
the correct starting location of a pratt parsed expression hard. The
"correction" of the location by subtracting an integer is often wrong
(since there may be arbitrary whitespace or comments between
tokens). Fix this by passing the token to the expression parsing
functions (instead of just providing a pratt_parse boolean). Use this
token to set the start of the expression.
Before gccrs would generate the following error message:
return.rs:3:22: error: cannot ‘break’ outside of a loop
3 | let x = 5 - break return (16 + 2);
| ^~~~~~~~~~~~~~~~~
Now we get:
return.rs:3:17: error: cannot ‘break’ outside of a loop
3 | let x = 5 - break return (16 + 2);
| ^
---
gcc/rust/parse/rust-parse-impl.h | 180 +++++++++++++------------------
gcc/rust/parse/rust-parse.h | 64 ++++++-----
2 files changed, 109 insertions(+), 135 deletions(-)
diff --git a/gcc/rust/parse/rust-parse-impl.h b/gcc/rust/parse/rust-parse-impl.h
index ccfff841784..1e951e4bd48 100644
--- a/gcc/rust/parse/rust-parse-impl.h
+++ b/gcc/rust/parse/rust-parse-impl.h
@@ -6586,7 +6586,7 @@ Parser<ManagedTokenSource>::parse_path_expr_segment ()
template <typename ManagedTokenSource>
AST::QualifiedPathInExpression
Parser<ManagedTokenSource>::parse_qualified_path_in_expression (
- bool pratt_parse)
+ const_TokenPtr pratt_parsed_token)
{
/* Note: the Rust grammar is defined in such a way that it is impossible to
* determine whether a prospective qualified path is a
@@ -6601,7 +6601,7 @@ Parser<ManagedTokenSource>::parse_qualified_path_in_expression (
// parse the qualified path type (required)
AST::QualifiedPathType qual_path_type
- = parse_qualified_path_type (pratt_parse);
+ = parse_qualified_path_type (pratt_parsed_token);
if (qual_path_type.is_error ())
{
// TODO: should this create a parse error?
@@ -6667,12 +6667,13 @@ Parser<ManagedTokenSource>::parse_qualified_path_in_expression (
// Parses the type syntactical construction at the start of a qualified path.
template <typename ManagedTokenSource>
AST::QualifiedPathType
-Parser<ManagedTokenSource>::parse_qualified_path_type (bool pratt_parse)
+Parser<ManagedTokenSource>::parse_qualified_path_type (
+ const_TokenPtr pratt_parsed_token)
{
- Location locus = Linemap::unknown_location ();
+ Location locus;
/* TODO: should this actually be error? is there anywhere where this could be
* valid? */
- if (!pratt_parse)
+ if (pratt_parsed_token == nullptr)
{
locus = lexer.peek_token ()->get_locus ();
if (!skip_token (LEFT_ANGLE))
@@ -6682,10 +6683,7 @@ Parser<ManagedTokenSource>::parse_qualified_path_type (bool pratt_parse)
}
}
else
- {
- // move back by 1 if pratt parsing due to skipping '<'
- locus = lexer.peek_token ()->get_locus () - 1;
- }
+ locus = pratt_parsed_token->get_locus ();
// parse type (required)
std::unique_ptr<AST::Type> type = parse_type ();
@@ -7311,10 +7309,10 @@ Parser<ManagedTokenSource>::parse_expr_without_block (AST::AttrVec outer_attrs)
template <typename ManagedTokenSource>
std::unique_ptr<AST::BlockExpr>
Parser<ManagedTokenSource>::parse_block_expr (AST::AttrVec outer_attrs,
- bool pratt_parse)
+ const_TokenPtr pratt_parsed_token)
{
- Location locus = Linemap::unknown_location ();
- if (!pratt_parse)
+ Location locus;
+ if (pratt_parsed_token == nullptr)
{
locus = lexer.peek_token ()->get_locus ();
if (!skip_token (LEFT_CURLY))
@@ -7324,9 +7322,7 @@ Parser<ManagedTokenSource>::parse_block_expr (AST::AttrVec outer_attrs,
}
}
else
- {
- locus = lexer.peek_token ()->get_locus () - 1;
- }
+ locus = pratt_parsed_token->get_locus ();
AST::AttrVec inner_attrs = parse_inner_attributes ();
@@ -7617,22 +7613,17 @@ Parser<ManagedTokenSource>::parse_literal_expr (AST::AttrVec outer_attrs)
// Parses a return expression (including any expression to return).
template <typename ManagedTokenSource>
std::unique_ptr<AST::ReturnExpr>
-Parser<ManagedTokenSource>::parse_return_expr (AST::AttrVec outer_attrs,
- bool pratt_parse)
+Parser<ManagedTokenSource>::parse_return_expr (
+ AST::AttrVec outer_attrs, const_TokenPtr pratt_parsed_token)
{
- Location locus = Linemap::unknown_location ();
- if (!pratt_parse)
+ Location locus;
+ if (pratt_parsed_token == nullptr)
{
locus = lexer.peek_token ()->get_locus ();
-
skip_token (RETURN_TOK);
}
else
- {
- // minus 7 chars for 6 in return and a space
- // or just TODO: pass in location data
- locus = lexer.peek_token ()->get_locus () - 7;
- }
+ locus = pratt_parsed_token->get_locus ();
// parse expression to return, if it exists
ParseRestrictions restrictions;
@@ -7650,21 +7641,16 @@ Parser<ManagedTokenSource>::parse_return_expr (AST::AttrVec outer_attrs,
template <typename ManagedTokenSource>
std::unique_ptr<AST::BreakExpr>
Parser<ManagedTokenSource>::parse_break_expr (AST::AttrVec outer_attrs,
- bool pratt_parse)
+ const_TokenPtr pratt_parsed_token)
{
- Location locus = Linemap::unknown_location ();
- if (!pratt_parse)
+ Location locus;
+ if (pratt_parsed_token == nullptr)
{
locus = lexer.peek_token ()->get_locus ();
-
skip_token (BREAK);
}
else
- {
- // minus 6 chars for 5 in return and a space
- // or just TODO: pass in location data
- locus = lexer.peek_token ()->get_locus () - 6;
- }
+ locus = pratt_parsed_token->get_locus ();
// parse label (lifetime) if it exists - create dummy first
AST::Lifetime label = AST::Lifetime::error ();
@@ -7687,22 +7673,17 @@ Parser<ManagedTokenSource>::parse_break_expr (AST::AttrVec outer_attrs,
// Parses a continue expression (including any label to continue from).
template <typename ManagedTokenSource>
std::unique_ptr<AST::ContinueExpr>
-Parser<ManagedTokenSource>::parse_continue_expr (AST::AttrVec outer_attrs,
- bool pratt_parse)
+Parser<ManagedTokenSource>::parse_continue_expr (
+ AST::AttrVec outer_attrs, const_TokenPtr pratt_parsed_token)
{
- Location locus = Linemap::unknown_location ();
- if (!pratt_parse)
+ Location locus;
+ if (pratt_parsed_token == nullptr)
{
locus = lexer.peek_token ()->get_locus ();
-
skip_token (CONTINUE);
}
else
- {
- // minus 9 chars for 8 in return and a space
- // or just TODO: pass in location data
- locus = lexer.peek_token ()->get_locus () - 9;
- }
+ locus = pratt_parsed_token->get_locus ();
// parse label (lifetime) if it exists - create dummy first
AST::Lifetime label = AST::Lifetime::error ();
@@ -7746,11 +7727,11 @@ Parser<ManagedTokenSource>::parse_loop_label ()
template <typename ManagedTokenSource>
std::unique_ptr<AST::IfExpr>
Parser<ManagedTokenSource>::parse_if_expr (AST::AttrVec outer_attrs,
- bool pratt_parse)
+ const_TokenPtr pratt_parsed_token)
{
// TODO: make having outer attributes an error?
- Location locus = Linemap::unknown_location ();
- if (!pratt_parse)
+ Location locus;
+ if (pratt_parsed_token == nullptr)
{
locus = lexer.peek_token ()->get_locus ();
if (!skip_token (IF))
@@ -7760,9 +7741,7 @@ Parser<ManagedTokenSource>::parse_if_expr (AST::AttrVec outer_attrs,
}
}
else
- {
- locus = lexer.peek_token ()->get_locus () - 1;
- }
+ locus = pratt_parsed_token->get_locus ();
// detect accidental if let
if (lexer.peek_token ()->get_id () == LET)
@@ -7907,12 +7886,12 @@ Parser<ManagedTokenSource>::parse_if_expr (AST::AttrVec outer_attrs,
* expressions don't support them. */
template <typename ManagedTokenSource>
std::unique_ptr<AST::IfLetExpr>
-Parser<ManagedTokenSource>::parse_if_let_expr (AST::AttrVec outer_attrs,
- bool pratt_parse)
+Parser<ManagedTokenSource>::parse_if_let_expr (
+ AST::AttrVec outer_attrs, const_TokenPtr pratt_parsed_token)
{
// TODO: make having outer attributes an error?
- Location locus = Linemap::unknown_location ();
- if (!pratt_parse)
+ Location locus;
+ if (pratt_parsed_token == nullptr)
{
locus = lexer.peek_token ()->get_locus ();
if (!skip_token (IF))
@@ -7922,9 +7901,7 @@ Parser<ManagedTokenSource>::parse_if_let_expr (AST::AttrVec outer_attrs,
}
}
else
- {
- locus = lexer.peek_token ()->get_locus () - 1;
- }
+ locus = pratt_parsed_token->get_locus ();
// detect accidental if expr parsed as if let expr
if (lexer.peek_token ()->get_id () != LET)
@@ -8100,10 +8077,10 @@ template <typename ManagedTokenSource>
std::unique_ptr<AST::LoopExpr>
Parser<ManagedTokenSource>::parse_loop_expr (AST::AttrVec outer_attrs,
AST::LoopLabel label,
- bool pratt_parse)
+ const_TokenPtr pratt_parsed_token)
{
- Location locus = Linemap::unknown_location ();
- if (!pratt_parse)
+ Location locus;
+ if (pratt_parsed_token == nullptr)
{
if (label.is_error ())
locus = lexer.peek_token ()->get_locus ();
@@ -8119,7 +8096,7 @@ Parser<ManagedTokenSource>::parse_loop_expr (AST::AttrVec outer_attrs,
else
{
if (label.is_error ())
- locus = lexer.peek_token ()->get_locus () - 1;
+ locus = pratt_parsed_token->get_locus ();
else
locus = label.get_locus ();
}
@@ -8144,12 +8121,12 @@ Parser<ManagedTokenSource>::parse_loop_expr (AST::AttrVec outer_attrs,
* via parse_labelled_loop_expr, which would call this. */
template <typename ManagedTokenSource>
std::unique_ptr<AST::WhileLoopExpr>
-Parser<ManagedTokenSource>::parse_while_loop_expr (AST::AttrVec outer_attrs,
- AST::LoopLabel label,
- bool pratt_parse)
+Parser<ManagedTokenSource>::parse_while_loop_expr (
+ AST::AttrVec outer_attrs, AST::LoopLabel label,
+ const_TokenPtr pratt_parsed_token)
{
- Location locus = Linemap::unknown_location ();
- if (!pratt_parse)
+ Location locus;
+ if (pratt_parsed_token == nullptr)
{
if (label.is_error ())
locus = lexer.peek_token ()->get_locus ();
@@ -8165,7 +8142,7 @@ Parser<ManagedTokenSource>::parse_while_loop_expr (AST::AttrVec outer_attrs,
else
{
if (label.is_error ())
- locus = lexer.peek_token ()->get_locus () - 1;
+ locus = pratt_parsed_token->get_locus ();
else
locus = label.get_locus ();
}
@@ -8423,21 +8400,16 @@ Parser<ManagedTokenSource>::parse_labelled_loop_expr (AST::AttrVec outer_attrs)
template <typename ManagedTokenSource>
std::unique_ptr<AST::MatchExpr>
Parser<ManagedTokenSource>::parse_match_expr (AST::AttrVec outer_attrs,
- bool pratt_parse)
+ const_TokenPtr pratt_parsed_token)
{
- Location locus = Linemap::unknown_location ();
- if (!pratt_parse)
+ Location locus;
+ if (pratt_parsed_token == nullptr)
{
locus = lexer.peek_token ()->get_locus ();
-
skip_token (MATCH_TOK);
}
else
- {
- // TODO: probably just pass in location data as param
- // get current pos then move back 6 - 5 for match, 1 for space
- locus = lexer.peek_token ()->get_locus () - 6;
- }
+ locus = pratt_parsed_token->get_locus ();
/* parse scrutinee expression, which is required (and HACK to prevent struct
* expr) */
@@ -8710,17 +8682,17 @@ Parser<ManagedTokenSource>::parse_async_block_expr (AST::AttrVec outer_attrs)
// Parses an unsafe block expression.
template <typename ManagedTokenSource>
std::unique_ptr<AST::UnsafeBlockExpr>
-Parser<ManagedTokenSource>::parse_unsafe_block_expr (AST::AttrVec outer_attrs,
- bool pratt_parse)
+Parser<ManagedTokenSource>::parse_unsafe_block_expr (
+ AST::AttrVec outer_attrs, const_TokenPtr pratt_parsed_token)
{
Location locus;
- if (!pratt_parse)
+ if (pratt_parsed_token == nullptr)
{
locus = lexer.peek_token ()->get_locus ();
skip_token (UNSAFE);
}
else
- locus = lexer.peek_token ()->get_locus () - 1;
+ locus = pratt_parsed_token->get_locus ();
// parse block expression (required)
std::unique_ptr<AST::BlockExpr> block_expr = parse_block_expr ();
@@ -8744,19 +8716,16 @@ Parser<ManagedTokenSource>::parse_unsafe_block_expr (AST::AttrVec outer_attrs,
template <typename ManagedTokenSource>
std::unique_ptr<AST::ArrayExpr>
Parser<ManagedTokenSource>::parse_array_expr (AST::AttrVec outer_attrs,
- bool pratt_parse)
+ const_TokenPtr pratt_parsed_token)
{
- Location locus = Linemap::unknown_location ();
- if (!pratt_parse)
+ Location locus;
+ if (pratt_parsed_token == nullptr)
{
locus = lexer.peek_token ()->get_locus ();
-
skip_token (LEFT_SQUARE);
}
else
- {
- locus = lexer.peek_token ()->get_locus () - 1;
- }
+ locus = pratt_parsed_token->get_locus ();
// parse optional inner attributes
AST::AttrVec inner_attrs = parse_inner_attributes ();
@@ -8933,20 +8902,17 @@ Parser<ManagedTokenSource>::parse_closure_param ()
template <typename ManagedTokenSource>
std::unique_ptr<AST::ExprWithoutBlock>
Parser<ManagedTokenSource>::parse_grouped_or_tuple_expr (
- AST::AttrVec outer_attrs, bool pratt_parse)
+ AST::AttrVec outer_attrs, const_TokenPtr pratt_parsed_token)
{
// adjustment to allow Pratt parsing to reuse function without copy-paste
- Location locus = Linemap::unknown_location ();
- if (!pratt_parse)
+ Location locus;
+ if (pratt_parsed_token == nullptr)
{
locus = lexer.peek_token ()->get_locus ();
-
skip_token (LEFT_PAREN);
}
else
- {
- locus = lexer.peek_token ()->get_locus () - 1;
- }
+ locus = pratt_parsed_token->get_locus ();
// parse optional inner attributes
AST::AttrVec inner_attrs = parse_inner_attributes ();
@@ -12541,7 +12507,7 @@ Parser<ManagedTokenSource>::null_denotation (const_TokenPtr tok,
// qualified path
// HACK: add outer attrs to path
AST::QualifiedPathInExpression path
- = parse_qualified_path_in_expression (true);
+ = parse_qualified_path_in_expression (tok);
path.set_outer_attrs (std::move (outer_attrs));
return std::unique_ptr<AST::QualifiedPathInExpression> (
new AST::QualifiedPathInExpression (std::move (path)));
@@ -12584,7 +12550,7 @@ Parser<ManagedTokenSource>::null_denotation (const_TokenPtr tok,
new AST::LiteralExpr ("false", AST::Literal::BOOL,
tok->get_type_hint (), {}, tok->get_locus ()));
case LEFT_PAREN:
- return parse_grouped_or_tuple_expr (std::move (outer_attrs), true);
+ return parse_grouped_or_tuple_expr (std::move (outer_attrs), tok);
/*case PLUS: { // unary plus operator
// invoke parse_expr recursively with appropriate priority, etc. for
@@ -12816,41 +12782,41 @@ Parser<ManagedTokenSource>::null_denotation (const_TokenPtr tok,
return parse_range_to_inclusive_expr (tok, std::move (outer_attrs));
case RETURN_TOK:
// FIXME: is this really a null denotation expression?
- return parse_return_expr (std::move (outer_attrs), true);
+ return parse_return_expr (std::move (outer_attrs), tok);
case BREAK:
// FIXME: is this really a null denotation expression?
- return parse_break_expr (std::move (outer_attrs), true);
+ return parse_break_expr (std::move (outer_attrs), tok);
case CONTINUE:
- return parse_continue_expr (std::move (outer_attrs), true);
+ return parse_continue_expr (std::move (outer_attrs), tok);
case LEFT_CURLY:
// ok - this is an expression with block for once.
- return parse_block_expr (std::move (outer_attrs), true);
+ return parse_block_expr (std::move (outer_attrs), tok);
case IF:
// if or if let, so more lookahead to find out
if (lexer.peek_token (1)->get_id () == LET)
{
// if let expr
- return parse_if_let_expr (std::move (outer_attrs), true);
+ return parse_if_let_expr (std::move (outer_attrs), tok);
}
else
{
// if expr
- return parse_if_expr (std::move (outer_attrs), true);
+ return parse_if_expr (std::move (outer_attrs), tok);
}
case LOOP:
return parse_loop_expr (std::move (outer_attrs), AST::LoopLabel::error (),
- true);
+ tok);
case WHILE:
return parse_while_loop_expr (std::move (outer_attrs),
- AST::LoopLabel::error (), true);
+ AST::LoopLabel::error (), tok);
case MATCH_TOK:
// also an expression with block
- return parse_match_expr (std::move (outer_attrs), true);
+ return parse_match_expr (std::move (outer_attrs), tok);
case LEFT_SQUARE:
// array definition expr (not indexing)
- return parse_array_expr (std::move (outer_attrs), true);
+ return parse_array_expr (std::move (outer_attrs), tok);
case UNSAFE:
- return parse_unsafe_block_expr (std::move (outer_attrs), true);
+ return parse_unsafe_block_expr (std::move (outer_attrs), tok);
default:
if (!restrictions.expr_can_be_null)
add_error (Error (tok->get_locus (),
diff --git a/gcc/rust/parse/rust-parse.h b/gcc/rust/parse/rust-parse.h
index 3920893faf6..10c99aa8898 100644
--- a/gcc/rust/parse/rust-parse.h
+++ b/gcc/rust/parse/rust-parse.h
@@ -120,9 +120,13 @@ private:
AST::TypePathFunction parse_type_path_function ();
AST::PathInExpression parse_path_in_expression ();
AST::PathExprSegment parse_path_expr_segment ();
+ // When given a pratt_parsed_token, use it as the first token parsed
+ // in the expression.
AST::QualifiedPathInExpression
- parse_qualified_path_in_expression (bool pratt_parse = false);
- AST::QualifiedPathType parse_qualified_path_type (bool pratt_parse = false);
+ parse_qualified_path_in_expression (const_TokenPtr pratt_parsed_token
+ = nullptr);
+ AST::QualifiedPathType
+ parse_qualified_path_type (const_TokenPtr pratt_parsed_token = nullptr);
AST::QualifiedPathInType parse_qualified_path_in_type ();
// Token tree or macro related
@@ -469,32 +473,34 @@ private:
parse_expr_with_block (AST::AttrVec outer_attrs);
std::unique_ptr<AST::ExprWithoutBlock>
parse_expr_without_block (AST::AttrVec outer_attrs = AST::AttrVec ());
- std::unique_ptr<AST::BlockExpr> parse_block_expr (AST::AttrVec outer_attrs
- = AST::AttrVec (),
- bool pratt_parse = false);
- std::unique_ptr<AST::IfExpr> parse_if_expr (AST::AttrVec outer_attrs
- = AST::AttrVec (),
- bool pratt_parse = false);
- std::unique_ptr<AST::IfLetExpr> parse_if_let_expr (AST::AttrVec outer_attrs
- = AST::AttrVec (),
- bool pratt_parse = false);
+ // When given a pratt_parsed_token, use it as the first token parsed
+ // in the expression.
+ std::unique_ptr<AST::BlockExpr>
+ parse_block_expr (AST::AttrVec outer_attrs = AST::AttrVec (),
+ const_TokenPtr pratt_parsed_token = nullptr);
+ std::unique_ptr<AST::IfExpr>
+ parse_if_expr (AST::AttrVec outer_attrs = AST::AttrVec (),
+ const_TokenPtr pratt_parsed_token = nullptr);
+ std::unique_ptr<AST::IfLetExpr>
+ parse_if_let_expr (AST::AttrVec outer_attrs = AST::AttrVec (),
+ const_TokenPtr pratt_parsed_token = nullptr);
std::unique_ptr<AST::LoopExpr>
parse_loop_expr (AST::AttrVec outer_attrs = AST::AttrVec (),
AST::LoopLabel label = AST::LoopLabel::error (),
- bool pratt_parse = false);
+ const_TokenPtr pratt_parsed_token = nullptr);
std::unique_ptr<AST::WhileLoopExpr>
parse_while_loop_expr (AST::AttrVec outer_attrs = AST::AttrVec (),
AST::LoopLabel label = AST::LoopLabel::error (),
- bool pratt_parse = false);
+ const_TokenPtr pratt_parsed_token = nullptr);
std::unique_ptr<AST::WhileLetLoopExpr>
parse_while_let_loop_expr (AST::AttrVec outer_attrs = AST::AttrVec (),
AST::LoopLabel label = AST::LoopLabel::error ());
std::unique_ptr<AST::ForLoopExpr>
parse_for_loop_expr (AST::AttrVec outer_attrs = AST::AttrVec (),
AST::LoopLabel label = AST::LoopLabel::error ());
- std::unique_ptr<AST::MatchExpr> parse_match_expr (AST::AttrVec outer_attrs
- = AST::AttrVec (),
- bool pratt_parse = false);
+ std::unique_ptr<AST::MatchExpr>
+ parse_match_expr (AST::AttrVec outer_attrs = AST::AttrVec (),
+ const_TokenPtr pratt_parsed_token = nullptr);
AST::MatchArm parse_match_arm ();
std::vector<std::unique_ptr<AST::Pattern> >
parse_match_arm_patterns (TokenId end_token_id);
@@ -510,24 +516,26 @@ private:
AST::ClosureParam parse_closure_param ();
std::unique_ptr<AST::LiteralExpr> parse_literal_expr (AST::AttrVec outer_attrs
= AST::AttrVec ());
- std::unique_ptr<AST::ReturnExpr> parse_return_expr (AST::AttrVec outer_attrs
- = AST::AttrVec (),
- bool pratt_parse = false);
- std::unique_ptr<AST::BreakExpr> parse_break_expr (AST::AttrVec outer_attrs
- = AST::AttrVec (),
- bool pratt_parse = false);
+ // When given a pratt_parsed_token, use it as the first token parsed
+ // in the expression.
+ std::unique_ptr<AST::ReturnExpr>
+ parse_return_expr (AST::AttrVec outer_attrs = AST::AttrVec (),
+ const_TokenPtr pratt_parsed_token = nullptr);
+ std::unique_ptr<AST::BreakExpr>
+ parse_break_expr (AST::AttrVec outer_attrs = AST::AttrVec (),
+ const_TokenPtr pratt_parsed_token = nullptr);
std::unique_ptr<AST::ContinueExpr>
parse_continue_expr (AST::AttrVec outer_attrs = AST::AttrVec (),
- bool pratt_parse = false);
+ const_TokenPtr pratt_parsed_token = nullptr);
std::unique_ptr<AST::UnsafeBlockExpr>
parse_unsafe_block_expr (AST::AttrVec outer_attrs = AST::AttrVec (),
- bool pratt_parse = false);
- std::unique_ptr<AST::ArrayExpr> parse_array_expr (AST::AttrVec outer_attrs
- = AST::AttrVec (),
- bool pratt_parse = false);
+ const_TokenPtr pratt_parsed_token = nullptr);
+ std::unique_ptr<AST::ArrayExpr>
+ parse_array_expr (AST::AttrVec outer_attrs = AST::AttrVec (),
+ const_TokenPtr pratt_parsed_token = nullptr);
std::unique_ptr<AST::ExprWithoutBlock>
parse_grouped_or_tuple_expr (AST::AttrVec outer_attrs = AST::AttrVec (),
- bool pratt_parse = false);
+ const_TokenPtr pratt_parsed_token = nullptr);
std::unique_ptr<AST::StructExprField> parse_struct_expr_field ();
bool will_be_expr_with_block ();
--
2.32.0
next prev parent reply other threads:[~2021-08-07 1:01 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-28 22:13 Mark Wielaard
2021-07-29 1:25 ` The Other
2021-07-29 10:55 ` Mark Wielaard
2021-07-29 15:18 ` Thomas Schwinge
2021-07-30 1:03 ` Mark Wielaard
2021-08-05 19:37 ` Mark Wielaard
2021-08-06 15:23 ` Philip Herron
2021-08-07 1:01 ` Mark Wielaard [this message]
2021-08-08 11:53 ` Philip Herron
2021-08-09 14:24 ` Mark Wielaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YQ3bc95TCaP7z2RG@wildebeest.org \
--to=mark@klomp.org \
--cc=gcc-rust@gcc.gnu.org \
--cc=philip.herron@embecosm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).