FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gccrs: ast: Unify explicitly and implicitly elided lifettimes

Browse source 
gcc/rust/ChangeLog:

	* ast/rust-ast.h: Elided lifetime static constructor
	* ast/rust-type.h: Default lifetime to elided.
	* parse/rust-parse-impl.h (Parser::parse_lifetime_param): Use elided lifetime.
	(Parser::parse_lifetime): Use elided lifetime/
	(Parser::lifetime_from_token): Use elided lifetime.
	(Parser::parse_self_param): Use elided lifetime.
	(Parser::parse_reference_type_inner): Use elided lifetime.

Signed-off-by: Jakub Dupak <dev@jakubdupak.com>
This commit is contained in:
Jakub Dupak 2023-12-03 12:25:23 +01:00 • committed by Arthur Cohen
parent c936a63cb7
commit 50f3059268
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gcc/rust/ast/rust-ast.h
View file

@ -1512,6 +1512,8 @@ public:
// Creates an "error" lifetime.
static Lifetime error () { return Lifetime (NAMED, ""); }
static Lifetime elided () { return Lifetime (WILDCARD, ""); }
// Returns true if the lifetime is in an error state.
bool is_error () const
{

2
gcc/rust/ast/rust-type.h
View file

@ -547,7 +547,7 @@ public:
// Constructor
ReferenceType (bool is_mut, std::unique_ptr<TypeNoBounds> type_no_bounds,
location_t locus, Lifetime lifetime = Lifetime::error ())
location_t locus, Lifetime lifetime = Lifetime::elided ())
: lifetime (std::move (lifetime)), has_mut (is_mut),
type (std::move (type_no_bounds)), locus (locus)
{}

10
gcc/rust/parse/rust-parse-impl.h
View file

@ -3470,8 +3470,6 @@ Parser<ManagedTokenSource>::parse_lifetime_param ()
return AST::LifetimeParam::create_error ();
}
lexer.skip_token ();
/* TODO: does this always create a named lifetime? or can a different type
* be made? */
AST::Lifetime lifetime (AST::Lifetime::NAMED, lifetime_tok->get_str (),
lifetime_tok->get_locus ());
@ -4141,10 +4139,9 @@ AST::Lifetime
Parser<ManagedTokenSource>::parse_lifetime ()
{
const_TokenPtr lifetime_tok = lexer.peek_token ();
// create error lifetime if doesn't exist
if (lifetime_tok->get_id () != LIFETIME)
{
return AST::Lifetime::error ();
return AST::Lifetime::elided ();
}
lexer.skip_token ();
@ -4164,6 +4161,7 @@ Parser<ManagedTokenSource>::lifetime_from_token (const_TokenPtr tok)
}
else if (lifetime_ident == "_")
{
// Explicitly and implicitly elided lifetimes follow the same rules.
return AST::Lifetime (AST::Lifetime::WILDCARD, "", locus);
}
else
@ -7177,7 +7175,7 @@ tl::expected<std::unique_ptr<AST::Param>, ParseSelfError>
Parser<ManagedTokenSource>::parse_self_param ()
{
bool has_reference = false;
AST::Lifetime lifetime = AST::Lifetime::error ();
AST::Lifetime lifetime = AST::Lifetime::elided ();
location_t locus = lexer.peek_token ()->get_locus ();
@ -9837,7 +9835,7 @@ std::unique_ptr<AST::ReferenceType>
Parser<ManagedTokenSource>::parse_reference_type_inner (location_t locus)
{
// parse optional lifetime
AST::Lifetime lifetime = AST::Lifetime::error ();
AST::Lifetime lifetime = AST::Lifetime::elided ();
if (lexer.peek_token ()->get_id () == LIFETIME)
{
lifetime = parse_lifetime ();