diff options
author | Jakub Dupak <dev@jakubdupak.com> | 2023-10-18 22:38:30 +0200 |
---|---|---|
committer | CohenArthur <arthur.cohen@embecosm.com> | 2023-10-26 15:05:49 +0000 |
commit | 8eb8474add2999de3476a8172c9418b46b99b9b3 (patch) | |
tree | 3976b95f1e2eb067c33d6f8b3d3697410fb6197a | |
parent | f5b9bab688ae04d84ba83269b21e80d671453e45 (diff) | |
download | gcc-8eb8474add2999de3476a8172c9418b46b99b9b3.zip gcc-8eb8474add2999de3476a8172c9418b46b99b9b3.tar.gz gcc-8eb8474add2999de3476a8172c9418b46b99b9b3.tar.bz2 |
borrowck: Dump: proper comma separation
gcc/rust/ChangeLog:
* checks/errors/borrowck/rust-bir-dump.cc (Dump::go): Use new print.
(print_comma_separated): Comma separation print.
(Dump::visit): Use new print.
Signed-off-by: Jakub Dupak <dev@jakubdupak.com>
-rw-r--r-- | gcc/rust/checks/errors/borrowck/rust-bir-dump.cc | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/gcc/rust/checks/errors/borrowck/rust-bir-dump.cc b/gcc/rust/checks/errors/borrowck/rust-bir-dump.cc index cebed24..4571b2f 100644 --- a/gcc/rust/checks/errors/borrowck/rust-bir-dump.cc +++ b/gcc/rust/checks/errors/borrowck/rust-bir-dump.cc @@ -28,15 +28,31 @@ get_tyty_name (TyTy::BaseType *tyty) return "unknown"; } +template <typename T, typename FN> void -Dump::go () +print_comma_separated (std::ostream &stream, const std::vector<T> &collection, + FN printer) { - stream << "fn " << name << "("; - for (PlaceId arg : func.arguments) + if (collection.empty ()) + return; + printer (collection[0]); + for (auto it = collection.begin () + 1; it != collection.end (); ++it) { - stream << "_" << get_place_name (arg) << ": " - << get_tyty_name (place_db[arg].tyty) << ", "; + stream << ", "; + printer (*it); } +} + +static constexpr bool FOLD_CFG = true; + +void +Dump::go () +{ + stream << "fn " << name << "("; + print_comma_separated (stream, func.arguments, [this] (PlaceId place_id) { + stream << "_" << get_place_name (place_id) << ": " + << get_tyty_name (place_db[place_id].tyty); + }); stream << ") -> " << get_tyty_name (place_db[RETURN_VALUE_PLACE].tyty) << " {\n"; @@ -182,11 +198,9 @@ void Dump::visit (InitializerExpr &expr) { stream << "{"; - for (auto &place : expr.get_values ()) - { - visit_move_place (place); - stream << ", "; - } + print_comma_separated (stream, expr.get_values (), [this] (PlaceId place_id) { + visit_move_place (place_id); + }); stream << "}"; } |