From: Mark Wielaard <mark@klomp.org>
To: Thomas Schwinge <thomas@codesourcery.com>
Cc: simplytheother@gmail.com, gcc-rust@gcc.gnu.org
Subject: Re: [PATCH] Pass pratt parsed token to expr parser functions to fix expr locus
Date: Fri, 30 Jul 2021 03:03:13 +0200 [thread overview]
Message-ID: <YQNP0RazDLancoc8@wildebeest.org> (raw)
In-Reply-To: <87r1fh9mhx.fsf@euler.schwinge.homeip.net>
[-- Attachment #1: Type: text/plain, Size: 1582 bytes --]
Hi,
On Thu, Jul 29, 2021 at 05:18:50PM +0200, Thomas Schwinge wrote:
> On 2021-07-29T12:55:38+0200, Mark Wielaard <mark@klomp.org> wrote:
> > On Thu, 2021-07-29 at 09:25 +0800, The Other via Gcc-rust wrote:
> >> But isn’t it overkill to pass the token in instead of just the
> >> location? You can avoid a fairly expensive shared_ptr copy by doing
> >> so.
> >
> > I hadn't even noticed it was a smart pointer. At least the abstraction
> > works transparently.
>
> Wouldn't 'const_TokenPtr &pratt_parsed_token' work, passing a C++
> reference? (Or am I missing some C++ "detail"; I haven't looked
> carefully.)
I think the issue is not the passing of the actual smart pointer, but
the construction in the default case. When we define the method
argument as const_TokenPtr pratt_parsed_token = nullptr we are
actually constructing a shared_ptr wrapper around the nullptr.
Of course in the case of passing a Location we also always have to
construct an object. But the Location class is very simple, so
hopefully it is cheaper to construct.
> > But yes, things might be even simpler by passing the location directly.
> > I'll try to rewrite the code tonight to pass a location and see how
> > that looks.
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.
Thanks,
Mark
[-- Attachment #2: 0001-Pass-pratt-parsed-location-to-expr-parser-functions-.patch --]
[-- Type: text/x-diff, Size: 22003 bytes --]
From 2c51713eec25b38ab2274537103a391d89894dba 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 location 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 location of the skipped token to the
expression parsing functions (instead of just providing a pratt_parse
boolean). Use this location 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 | 177 +++++++++++--------------------
gcc/rust/parse/rust-parse.h | 63 ++++++-----
2 files changed, 95 insertions(+), 145 deletions(-)
diff --git a/gcc/rust/parse/rust-parse-impl.h b/gcc/rust/parse/rust-parse-impl.h
index 340fea70201..4b208f0da23 100644
--- a/gcc/rust/parse/rust-parse-impl.h
+++ b/gcc/rust/parse/rust-parse-impl.h
@@ -6580,7 +6580,7 @@ Parser<ManagedTokenSource>::parse_path_expr_segment ()
template <typename ManagedTokenSource>
AST::QualifiedPathInExpression
Parser<ManagedTokenSource>::parse_qualified_path_in_expression (
- bool pratt_parse)
+ Location pratt_parsed_loc)
{
/* Note: the Rust grammar is defined in such a way that it is impossible to
* determine whether a prospective qualified path is a
@@ -6595,7 +6595,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_loc);
if (qual_path_type.is_error ())
{
// TODO: should this create a parse error?
@@ -6661,12 +6661,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 (
+ Location pratt_parsed_loc)
{
- Location locus = Linemap::unknown_location ();
+ Location locus = pratt_parsed_loc;
/* TODO: should this actually be error? is there anywhere where this could be
* valid? */
- if (!pratt_parse)
+ if (locus == Linemap::unknown_location ())
{
locus = lexer.peek_token ()->get_locus ();
if (!skip_token (LEFT_ANGLE))
@@ -6675,11 +6676,6 @@ Parser<ManagedTokenSource>::parse_qualified_path_type (bool pratt_parse)
return AST::QualifiedPathType::create_error ();
}
}
- else
- {
- // move back by 1 if pratt parsing due to skipping '<'
- locus = lexer.peek_token ()->get_locus () - 1;
- }
// parse type (required)
std::unique_ptr<AST::Type> type = parse_type ();
@@ -7305,10 +7301,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)
+ Location pratt_parsed_loc)
{
- Location locus = Linemap::unknown_location ();
- if (!pratt_parse)
+ Location locus = pratt_parsed_loc;
+ if (locus == Linemap::unknown_location ())
{
locus = lexer.peek_token ()->get_locus ();
if (!skip_token (LEFT_CURLY))
@@ -7317,10 +7313,6 @@ Parser<ManagedTokenSource>::parse_block_expr (AST::AttrVec outer_attrs,
return nullptr;
}
}
- else
- {
- locus = lexer.peek_token ()->get_locus () - 1;
- }
AST::AttrVec inner_attrs = parse_inner_attributes ();
@@ -7612,21 +7604,14 @@ Parser<ManagedTokenSource>::parse_literal_expr (AST::AttrVec outer_attrs)
template <typename ManagedTokenSource>
std::unique_ptr<AST::ReturnExpr>
Parser<ManagedTokenSource>::parse_return_expr (AST::AttrVec outer_attrs,
- bool pratt_parse)
+ Location pratt_parsed_loc)
{
- Location locus = Linemap::unknown_location ();
- if (!pratt_parse)
+ Location locus = pratt_parsed_loc;
+ if (locus == Linemap::unknown_location ())
{
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;
- }
// parse expression to return, if it exists
ParseRestrictions restrictions;
@@ -7644,21 +7629,14 @@ 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)
+ Location pratt_parsed_loc)
{
- Location locus = Linemap::unknown_location ();
- if (!pratt_parse)
+ Location locus = pratt_parsed_loc;
+ if (locus == Linemap::unknown_location ())
{
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;
- }
// parse label (lifetime) if it exists - create dummy first
AST::Lifetime label = AST::Lifetime::error ();
@@ -7682,21 +7660,14 @@ Parser<ManagedTokenSource>::parse_break_expr (AST::AttrVec outer_attrs,
template <typename ManagedTokenSource>
std::unique_ptr<AST::ContinueExpr>
Parser<ManagedTokenSource>::parse_continue_expr (AST::AttrVec outer_attrs,
- bool pratt_parse)
+ Location pratt_parsed_loc)
{
- Location locus = Linemap::unknown_location ();
- if (!pratt_parse)
+ Location locus = pratt_parsed_loc;
+ if (locus == Linemap::unknown_location ())
{
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;
- }
// parse label (lifetime) if it exists - create dummy first
AST::Lifetime label = AST::Lifetime::error ();
@@ -7740,11 +7711,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)
+ Location pratt_parsed_loc)
{
// TODO: make having outer attributes an error?
- Location locus = Linemap::unknown_location ();
- if (!pratt_parse)
+ Location locus = pratt_parsed_loc;
+ if (locus == Linemap::unknown_location ())
{
locus = lexer.peek_token ()->get_locus ();
if (!skip_token (IF))
@@ -7753,10 +7724,6 @@ Parser<ManagedTokenSource>::parse_if_expr (AST::AttrVec outer_attrs,
return nullptr;
}
}
- else
- {
- locus = lexer.peek_token ()->get_locus () - 1;
- }
// detect accidental if let
if (lexer.peek_token ()->get_id () == LET)
@@ -7902,11 +7869,11 @@ Parser<ManagedTokenSource>::parse_if_expr (AST::AttrVec outer_attrs,
template <typename ManagedTokenSource>
std::unique_ptr<AST::IfLetExpr>
Parser<ManagedTokenSource>::parse_if_let_expr (AST::AttrVec outer_attrs,
- bool pratt_parse)
+ Location pratt_parsed_loc)
{
// TODO: make having outer attributes an error?
- Location locus = Linemap::unknown_location ();
- if (!pratt_parse)
+ Location locus = pratt_parsed_loc;
+ if (locus == Linemap::unknown_location ())
{
locus = lexer.peek_token ()->get_locus ();
if (!skip_token (IF))
@@ -7915,10 +7882,6 @@ Parser<ManagedTokenSource>::parse_if_let_expr (AST::AttrVec outer_attrs,
return nullptr;
}
}
- else
- {
- locus = lexer.peek_token ()->get_locus () - 1;
- }
// detect accidental if expr parsed as if let expr
if (lexer.peek_token ()->get_id () != LET)
@@ -8094,10 +8057,10 @@ template <typename ManagedTokenSource>
std::unique_ptr<AST::LoopExpr>
Parser<ManagedTokenSource>::parse_loop_expr (AST::AttrVec outer_attrs,
AST::LoopLabel label,
- bool pratt_parse)
+ Location pratt_parsed_loc)
{
- Location locus = Linemap::unknown_location ();
- if (!pratt_parse)
+ Location locus = pratt_parsed_loc;
+ if (locus == Linemap::unknown_location ())
{
if (label.is_error ())
locus = lexer.peek_token ()->get_locus ();
@@ -8112,9 +8075,7 @@ Parser<ManagedTokenSource>::parse_loop_expr (AST::AttrVec outer_attrs,
}
else
{
- if (label.is_error ())
- locus = lexer.peek_token ()->get_locus () - 1;
- else
+ if (!label.is_error ())
locus = label.get_locus ();
}
@@ -8140,10 +8101,10 @@ template <typename ManagedTokenSource>
std::unique_ptr<AST::WhileLoopExpr>
Parser<ManagedTokenSource>::parse_while_loop_expr (AST::AttrVec outer_attrs,
AST::LoopLabel label,
- bool pratt_parse)
+ Location pratt_parsed_loc)
{
- Location locus = Linemap::unknown_location ();
- if (!pratt_parse)
+ Location locus = pratt_parsed_loc;
+ if (locus == Linemap::unknown_location ())
{
if (label.is_error ())
locus = lexer.peek_token ()->get_locus ();
@@ -8158,9 +8119,7 @@ Parser<ManagedTokenSource>::parse_while_loop_expr (AST::AttrVec outer_attrs,
}
else
{
- if (label.is_error ())
- locus = lexer.peek_token ()->get_locus () - 1;
- else
+ if (!label.is_error ())
locus = label.get_locus ();
}
@@ -8417,21 +8376,14 @@ 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)
+ Location pratt_parsed_loc)
{
- Location locus = Linemap::unknown_location ();
- if (!pratt_parse)
+ Location locus = pratt_parsed_loc;
+ if (locus == Linemap::unknown_location ())
{
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;
- }
/* parse scrutinee expression, which is required (and HACK to prevent struct
* expr) */
@@ -8705,16 +8657,14 @@ Parser<ManagedTokenSource>::parse_async_block_expr (AST::AttrVec outer_attrs)
template <typename ManagedTokenSource>
std::unique_ptr<AST::UnsafeBlockExpr>
Parser<ManagedTokenSource>::parse_unsafe_block_expr (AST::AttrVec outer_attrs,
- bool pratt_parse)
+ Location pratt_parsed_loc)
{
- Location locus;
- if (!pratt_parse)
+ Location locus = pratt_parsed_loc;
+ if (locus == Linemap::unknown_location ())
{
locus = lexer.peek_token ()->get_locus ();
skip_token (UNSAFE);
}
- else
- locus = lexer.peek_token ()->get_locus () - 1;
// parse block expression (required)
std::unique_ptr<AST::BlockExpr> block_expr = parse_block_expr ();
@@ -8738,19 +8688,14 @@ 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)
+ Location pratt_parsed_loc)
{
- Location locus = Linemap::unknown_location ();
- if (!pratt_parse)
+ Location locus = pratt_parsed_loc;
+ if (locus == Linemap::unknown_location ())
{
locus = lexer.peek_token ()->get_locus ();
-
skip_token (LEFT_SQUARE);
}
- else
- {
- locus = lexer.peek_token ()->get_locus () - 1;
- }
// parse optional inner attributes
AST::AttrVec inner_attrs = parse_inner_attributes ();
@@ -8927,20 +8872,15 @@ 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, Location pratt_parsed_loc)
{
// adjustment to allow Pratt parsing to reuse function without copy-paste
- Location locus = Linemap::unknown_location ();
- if (!pratt_parse)
+ Location locus = pratt_parsed_loc;
+ if (locus == Linemap::unknown_location ())
{
locus = lexer.peek_token ()->get_locus ();
-
skip_token (LEFT_PAREN);
}
- else
- {
- locus = lexer.peek_token ()->get_locus () - 1;
- }
// parse optional inner attributes
AST::AttrVec inner_attrs = parse_inner_attributes ();
@@ -12535,7 +12475,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->get_locus ());
path.set_outer_attrs (std::move (outer_attrs));
return std::unique_ptr<AST::QualifiedPathInExpression> (
new AST::QualifiedPathInExpression (std::move (path)));
@@ -12578,7 +12518,8 @@ 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->get_locus ());
/*case PLUS: { // unary plus operator
// invoke parse_expr recursively with appropriate priority, etc. for
@@ -12810,41 +12751,43 @@ 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->get_locus ());
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->get_locus ());
case CONTINUE:
- return parse_continue_expr (std::move (outer_attrs), true);
+ return parse_continue_expr (std::move (outer_attrs), tok->get_locus ());
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->get_locus ());
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->get_locus ());
}
else
{
// if expr
- return parse_if_expr (std::move (outer_attrs), true);
+ return parse_if_expr (std::move (outer_attrs), tok->get_locus ());
}
case LOOP:
return parse_loop_expr (std::move (outer_attrs), AST::LoopLabel::error (),
- true);
+ tok->get_locus ());
case WHILE:
return parse_while_loop_expr (std::move (outer_attrs),
- AST::LoopLabel::error (), true);
+ AST::LoopLabel::error (),
+ tok->get_locus ());
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->get_locus ());
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->get_locus ());
case UNSAFE:
- return parse_unsafe_block_expr (std::move (outer_attrs), true);
+ return parse_unsafe_block_expr (std::move (outer_attrs),
+ tok->get_locus ());
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 1c7bd781b3f..ec68abf8995 100644
--- a/gcc/rust/parse/rust-parse.h
+++ b/gcc/rust/parse/rust-parse.h
@@ -121,8 +121,11 @@ private:
AST::PathInExpression parse_path_in_expression ();
AST::PathExprSegment parse_path_expr_segment ();
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 (Location pratt_parsed_loc
+ = Linemap::unknown_location ());
+ AST::QualifiedPathType
+ parse_qualified_path_type (Location pratt_parsed_loc
+ = Linemap::unknown_location ());
AST::QualifiedPathInType parse_qualified_path_in_type ();
// Token tree or macro related
@@ -470,32 +473,33 @@ 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);
+ std::unique_ptr<AST::BlockExpr>
+ parse_block_expr (AST::AttrVec outer_attrs = AST::AttrVec (),
+ Location pratt_parsed_loc = Linemap::unknown_location ());
+ std::unique_ptr<AST::IfExpr>
+ parse_if_expr (AST::AttrVec outer_attrs = AST::AttrVec (),
+ Location pratt_parsed_loc = Linemap::unknown_location ());
+ std::unique_ptr<AST::IfLetExpr>
+ parse_if_let_expr (AST::AttrVec outer_attrs = AST::AttrVec (),
+ Location pratt_parsed_loc = Linemap::unknown_location ());
std::unique_ptr<AST::LoopExpr>
parse_loop_expr (AST::AttrVec outer_attrs = AST::AttrVec (),
AST::LoopLabel label = AST::LoopLabel::error (),
- bool pratt_parse = false);
+ Location pratt_parsed_loc = Linemap::unknown_location ());
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);
+ Location pratt_parsed_loc
+ = Linemap::unknown_location ());
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 (),
+ Location pratt_parsed_loc = Linemap::unknown_location ());
AST::MatchArm parse_match_arm ();
std::vector<std::unique_ptr<AST::Pattern> >
parse_match_arm_patterns (TokenId end_token_id);
@@ -511,24 +515,27 @@ 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);
+ std::unique_ptr<AST::ReturnExpr>
+ parse_return_expr (AST::AttrVec outer_attrs = AST::AttrVec (),
+ Location pratt_parsed_loc = Linemap::unknown_location ());
+ std::unique_ptr<AST::BreakExpr>
+ parse_break_expr (AST::AttrVec outer_attrs = AST::AttrVec (),
+ Location pratt_parsed_loc = Linemap::unknown_location ());
std::unique_ptr<AST::ContinueExpr>
parse_continue_expr (AST::AttrVec outer_attrs = AST::AttrVec (),
- bool pratt_parse = false);
+ Location pratt_parsed_loc
+ = Linemap::unknown_location ());
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);
+ Location pratt_parsed_loc
+ = Linemap::unknown_location ());
+ std::unique_ptr<AST::ArrayExpr>
+ parse_array_expr (AST::AttrVec outer_attrs = AST::AttrVec (),
+ Location pratt_parsed_loc = Linemap::unknown_location ());
std::unique_ptr<AST::ExprWithoutBlock>
parse_grouped_or_tuple_expr (AST::AttrVec outer_attrs = AST::AttrVec (),
- bool pratt_parse = false);
+ Location pratt_parsed_loc
+ = Linemap::unknown_location ());
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-07-30 1:03 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 [this message]
2021-08-05 19:37 ` Mark Wielaard
2021-08-06 15:23 ` Philip Herron
2021-08-07 1:01 ` Mark Wielaard
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=YQNP0RazDLancoc8@wildebeest.org \
--to=mark@klomp.org \
--cc=gcc-rust@gcc.gnu.org \
--cc=simplytheother@gmail.com \
--cc=thomas@codesourcery.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).