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

gccrs: Fix macro parsing for trait items.

Browse source 
gcc/rust/ChangeLog:

	* parse/rust-parse-impl.h (Parser::parse_trait_item):
	Handle macros in trait items similar to how its handled for trait
	implementation items.

Signed-off-by: Kushal Pal <kushalpal109@gmail.com>
This commit is contained in:
Kushal Pal 2024-01-26 18:35:59 +05:30 • committed by Arthur Cohen
parent 1e114b62e6
commit af3f048236
1 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5094,6 +5094,18 @@ Parser<ManagedTokenSource>::parse_trait_item ()
const_TokenPtr tok = lexer.peek_token ();
switch (tok->get_id ())
{
case SUPER:
case SELF:
case CRATE:
case DOLLAR_SIGN:
// these seem to be SimplePath tokens, so this is a macro invocation
// semi
return parse_macro_invocation_semi (std::move (outer_attrs));
case IDENTIFIER:
if (lexer.peek_token ()->get_str () == Values::WeakKeywords::DEFAULT)
return parse_function (std::move (vis), std::move (outer_attrs));
else
return parse_macro_invocation_semi (std::move (outer_attrs));
case TYPE:
return parse_trait_type (std::move (outer_attrs), vis);
case CONST:
@ -5110,25 +5122,14 @@ Parser<ManagedTokenSource>::parse_trait_item ()
case EXTERN_KW:
case FN_KW:
return parse_function (std::move (vis), std::move (outer_attrs));
default: {
// TODO: try and parse macro invocation semi - if fails, maybe error.
std::unique_ptr<AST::TraitItem> macro_invoc
= parse_macro_invocation_semi (outer_attrs);
if (macro_invoc == nullptr)
{
// TODO: error?
return nullptr;
}
else
{
return macro_invoc;
}
/* FIXME: macro invocations can only start with certain tokens. be
* more picky with these? */
}
default:
break;
}
add_error (Error (tok->get_locus (),
"unrecognised token %qs for item in trait",
tok->get_token_description ()));
// skip?
return nullptr;
}
// Parse a typedef trait item.