diff options
author | Arthur Cohen <arthur.cohen@embecosm.com> | 2024-01-30 16:16:36 +0100 |
---|---|---|
committer | Arthur Cohen <arthur.cohen@embecosm.com> | 2024-08-01 13:11:29 +0200 |
commit | d72a8e93083fd89ab73015ff9f4bf00ddb923cf7 (patch) | |
tree | bed5708bb9dd9c9ab6451bdc79e4e2c1b51c9a29 | |
parent | 6e04e69bff8e92a8df0f7663f9f7d3aac1b7fd31 (diff) | |
download | gcc-d72a8e93083fd89ab73015ff9f4bf00ddb923cf7.zip gcc-d72a8e93083fd89ab73015ff9f4bf00ddb923cf7.tar.gz gcc-d72a8e93083fd89ab73015ff9f4bf00ddb923cf7.tar.bz2 |
gccrs: format_args: Parse format string properly
gcc/rust/ChangeLog:
* expand/rust-macro-builtins.cc (MacroBuiltin::format_args_handler):
Construct string to parser properly.
-rw-r--r-- | gcc/rust/expand/rust-macro-builtins.cc | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/gcc/rust/expand/rust-macro-builtins.cc b/gcc/rust/expand/rust-macro-builtins.cc index 0e57406..19ea910 100644 --- a/gcc/rust/expand/rust-macro-builtins.cc +++ b/gcc/rust/expand/rust-macro-builtins.cc @@ -947,7 +947,24 @@ tl::optional<AST::Fragment> MacroBuiltin::format_args_handler (location_t invoc_locus, AST::MacroInvocData &invoc) { - Fmt::Pieces::collect ("heyo this {is} what I {} want to {3}, {parse}"); + auto fmt_expr + = parse_single_string_literal (BuiltinMacro::FormatArgs, + invoc.get_delim_tok_tree (), invoc_locus, + invoc.get_expander ()); + + if (!fmt_expr) + return AST::Fragment::create_error (); + + // if it is not a literal, it's an eager macro invocation - return it + if (!fmt_expr->is_literal ()) + { + auto token_tree = invoc.get_delim_tok_tree (); + return AST::Fragment ({AST::SingleASTNode (std::move (fmt_expr))}, + token_tree.to_token_stream ()); + } + + auto format_string = fmt_expr->as_string (); + auto pieces = Fmt::Pieces::collect (format_string); return AST::Fragment::create_empty (); } |