Replace for-iterator loops with for-each loops and algorithm functions under libs/ #949

aledomu · 2024-11-19T19:27:21Z

No description provided.

pauldavisthefirst

This can be very dangerous to do automatically. Perhaps the sed replacements handle it, but there are container-specific cases where erase invalidates the iterator and the code structure doesn't allow for i = container.erase()

Also, I don't see the point in using a type in the for loop if these changes are made. Why not just for (auto & i : container) { ... } ?

x42 · 2024-11-19T19:35:30Z

or better yet with explicit const for (auto const& i : container) { ... }

x42 · 2024-11-19T19:36:16Z

for loops are one of the only good uses for auto. IMHO

keryell · 2024-11-20T04:16:45Z

libs/ardour/location.cc

+	for (const std::pair<const string, string>& m : cd_info) {
+		node->add_child_nocopy(cd_info_node(m.first, m.second));


The usual modern way is

Suggested change

for (const std::pair<const string, string>& m : cd_info) {

node->add_child_nocopy(cd_info_node(m.first, m.second));

for (auto&& [some_stuff, another_thing] : cd_info) {

node->add_child_nocopy(cd_info_node(some_stuff, another_thing));

picking the right names obviously.

…op in libs/ Regex substitutions have to be run in the following order: for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?map<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]\*[ \t\n],[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*>::iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*(.*)\.begin[ \t\n]*\(\);[ \t\n]*\3[ \t\n]*(?:<|!=)[ \t\n]*\4(?:\.|->)end[ \t\n]*\(\);[ \t\n]*(?:\+\+\3|\3\+\+)\)[ \t\n]*\{ -> for (std::pair<\1* const&,\2>& \3 : \4) { for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?map<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n],[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*>::iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*(.*)\.begin[ \t\n]*\(\);[ \t\n]*\3[ \t\n]*(?:<|!=)[ \t\n]*\4(?:\.|->)end[ \t\n]*\(\);[ \t\n]*(?:\+\+\3|\3\+\+)\)[ \t\n]*\{ -> for (std::pair<const \1,\2>& \3 : \4) { for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?map<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]\*[ \t\n],[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*>::iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*(.*)->begin[ \t\n]*\(\);[ \t\n]*\3[ \t\n]*(?:<|!=)[ \t\n]*\4->end[ \t\n]*\(\);[ \t\n]*(?:\+\+\3|\3\+\+)\)[ \t\n]*\{ -> for (std::pair<\1* const&,\2>& \3 : *\4) { for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?map<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n],[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*>::iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*(.*)->begin[ \t\n]*\(\);[ \t\n]*\3[ \t\n]*(?:<|!=)[ \t\n]*\4(?:\.|->)end[ \t\n]*\(\);[ \t\n]*(?:\+\+\3|\3\+\+)\)[ \t\n]*\{ -> for (std::pair<const \1,\2>& \3 : *\4) { for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?map<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]\*[ \t\n],[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*>::iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*begin[ \t\n]*\(\);[ \t\n]*\3[ \t\n]*(?:<|!=)[ \t\n]*end[ \t\n]*\(\);[ \t\n]*(?:\+\+\3|\3\+\+)\)[ \t\n]*\{ -> for (std::pair<\1* const&,\2>& \3 : *this) { for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?map<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n],[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*>::iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*begin[ \t\n]*\(\);[ \t\n]*\3[ \t\n]*(?:<|!=)[ \t\n]*end[ \t\n]*\(\);[ \t\n]*(?:\+\+\3|\3\+\+)\)[ \t\n]*\{ -> for (std::pair<const \1,\2>& \3 : *this) { Any dereferencing of the loop internal variable has to be removed manually.

…ach loop in libs/ Regex substitutions have to be run in the following order: for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?map<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]\*[ \t\n],[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*>::const_iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*(.*)\.begin[ \t\n]*\(\);[ \t\n]*\3[ \t\n]*(?:<|!=)[ \t\n]*\4\.end[ \t\n]*\(\);[ \t\n]*(?:\+\+\3|\3\+\+)\)[ \t\n]*\{ -> for (const std::pair<\1* const&,\2>& \3 : \4) { for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?map<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n],[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*>::const_iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*(.*)\.begin[ \t\n]*\(\);[ \t\n]*\3[ \t\n]*(?:<|!=)[ \t\n]*\4\.end[ \t\n]*\(\);[ \t\n]*(?:\+\+\3|\3\+\+)\)[ \t\n]*\{ -> for (const std::pair<const \1,\2>& \3 : \4) { for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?map<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]\*[ \t\n],[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*>::const_iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*(.*)->begin[ \t\n]*\(\);[ \t\n]*\3[ \t\n]*(?:<|!=)[ \t\n]*\4->end[ \t\n]*\(\);[ \t\n]*(?:\+\+\3|\3\+\+)\)[ \t\n]*\{ -> for (const std::pair<\1* const&,\2>& \3 : *\4) { for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?map<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n],[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*>::const_iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*(.*)->begin[ \t\n]*\(\);[ \t\n]*\3[ \t\n]*(?:<|!=)[ \t\n]*\4->end[ \t\n]*\(\);[ \t\n]*(?:\+\+\3|\3\+\+)\)[ \t\n]*\{ -> for (const std::pair<const \1,\2>& \3 : *\4) { for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?map<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]\*[ \t\n],[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*>::const_iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*begin[ \t\n]*\(\);[ \t\n]*\3[ \t\n]*(?:<|!=)[ \t\n]*end[ \t\n]*\(\);[ \t\n]*(?:\+\+\3|\3\+\+)\)[ \t\n]*\{ -> for (const std::pair<\1* const&,\2>& \3 : *this) { for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?map<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n],[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*>::const_iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*begin[ \t\n]*\(\);[ \t\n]*\3[ \t\n]*(?:<|!=)[ \t\n]*end[ \t\n]*\(\);[ \t\n]*(?:\+\+\3|\3\+\+)\)[ \t\n]*\{ -> for (const std::pair<const \1,\2>& \3 : *this) { Any dereferencing of the loop internal variable has to be removed manually.

… loop in libs/ Regex substitutions have to be run in the following order: for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?vector<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*>::iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*(.*)\.begin[ \t\n]*\(\);[ \t\n]*\2[ \t\n]*(?:<|!=)[ \t\n]*\3\.end[ \t\n]*\(\);[ \t\n]*(?:\+\+\2|\2\+\+)\)[ \t\n]*\{ -> for (\1& \2 : \3) { for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?vector<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*>::iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*(.*)->begin[ \t\n]*\(\);[ \t\n]*\2[ \t\n]*(?:<|!=)[ \t\n]*\3->end[ \t\n]*\(\);[ \t\n]*(?:\+\+\2|\2\+\+)\)[ \t\n]*\{ -> for (\1& \2 : *\3) { for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?vector<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*>::iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*begin[ \t\n]*\(\);[ \t\n]*\2[ \t\n]*(?:<|!=)[ \t\n]*end[ \t\n]*\(\);[ \t\n]*(?:\+\+\2|\2\+\+)\)[ \t\n]*\{ -> for (\1& \2 : *this) { Any dereferencing of the loop internal variable has to be removed manually.

…r-each loop in libs/ Regex substitutions have to be run in the following order: for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?vector<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*\*[ \t\n]*>::const_iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*(.*)\.begin[ \t\n]*\(\);[ \t\n]*\2[ \t\n]*(?:<|!=)[ \t\n]*\3\.end[ \t\n]*\(\);[ \t\n]*(?:\+\+\2|\2\+\+)\)[ \t\n]*\{ -> for (\1* const& \2 : \3) { for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?vector<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*>::const_iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*(.*)\.begin[ \t\n]*\(\);[ \t\n]*\2[ \t\n]*(?:<|!=)[ \t\n]*\3\.end[ \t\n]*\(\);[ \t\n]*(?:\+\+\2|\2\+\+)\)[ \t\n]*\{ -> for (const \1& \2 : \3) { for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?vector<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*\*[ \t\n]*>::const_iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*(.*)->begin[ \t\n]*\(\);[ \t\n]*\2[ \t\n]*(?:<|!=)[ \t\n]*\3->end[ \t\n]*\(\);[ \t\n]*(?:\+\+\2|\2\+\+)\)[ \t\n]*\{ -> for (\1* const& \2 : *\3) { for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?vector<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*>::const_iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*(.*)->begin[ \t\n]*\(\);[ \t\n]*\2[ \t\n]*(?:<|!=)[ \t\n]*\3->end[ \t\n]*\(\);[ \t\n]*(?:\+\+\2|\2\+\+)\)[ \t\n]*\{ -> for (const \1& \2 : *\3) { for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?vector<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*\*[ \t\n]*>::const_iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*begin[ \t\n]*\(\);[ \t\n]*\2[ \t\n]*(?:<|!=)[ \t\n]*end[ \t\n]*\(\);[ \t\n]*(?:\+\+\2|\2\+\+)\)[ \t\n]*\{ -> for (\1* const& \2 : *this) { for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?vector<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*>::const_iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*begin[ \t\n]*\(\);[ \t\n]*\2[ \t\n]*(?:<|!=)[ \t\n]*end[ \t\n]*\(\);[ \t\n]*(?:\+\+\2|\2\+\+)\)[ \t\n]*\{ -> for (const \1& \2 : this) { Any dereferencing of the loop internal variable has to be removed manually.

…op in libs/ Regex substitutions have to be run in the following order: for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?set<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*\*[ \t\n]*>::iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*(.*)\.begin[ \t\n]*\(\);[ \t\n]*\2[ \t\n]*(?:<|!=)[ \t\n]*\3\.end[ \t\n]*\(\);[ \t\n]*(?:\+\+\2|\2\+\+)\)[ \t\n]*\{ -> for (\1* const& \2 : \3) { for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?set<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*>::iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*(.*)\.begin[ \t\n]*\(\);[ \t\n]*\2[ \t\n]*(?:<|!=)[ \t\n]*\3\.end[ \t\n]*\(\);[ \t\n]*(?:\+\+\2|\2\+\+)\)[ \t\n]*\{ -> for (const \1& \2 : \3) { for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?set<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*\*[ \t\n]*>::iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*(.*)->begin[ \t\n]*\(\);[ \t\n]*\2[ \t\n]*(?:<|!=)[ \t\n]*\3->end[ \t\n]*\(\);[ \t\n]*(?:\+\+\2|\2\+\+)\)[ \t\n]*\{ -> for (\1* const& \2 : \3) { for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?set<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*>::iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*(.*)->begin[ \t\n]*\(\);[ \t\n]*\2[ \t\n]*(?:<|!=)[ \t\n]*\3->end[ \t\n]*\(\);[ \t\n]*(?:\+\+\2|\2\+\+)\)[ \t\n]*\{ -> for (const \1& \2 : \3) { for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?set<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*\*[ \t\n]*>::iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*begin[ \t\n]*\(\);[ \t\n]*\2[ \t\n]*(?:<|!=)[ \t\n]*end[ \t\n]*\(\);[ \t\n]*(?:\+\+\2|\2\+\+)\)[ \t\n]*\{ -> for (\1* const& \2 : *this) { for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?set<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*>::iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*begin[ \t\n]*\(\);[ \t\n]*\2[ \t\n]*(?:<|!=)[ \t\n]*end[ \t\n]*\(\);[ \t\n]*(?:\+\+\2|\2\+\+)\)[ \t\n]*\{ -> for (const \1& \2 : *this) { Any dereferencing of the loop internal variable has to be removed manually.

…ach loop in libs/ Regex substitutions have to be run in the following order: for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?set<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*\*[ \t\n]*>::const_iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*(.*)\.begin[ \t\n]*\(\);[ \t\n]*\2[ \t\n]*(?:<|!=)[ \t\n]*\3\.end[ \t\n]*\(\);[ \t\n]*(?:\+\+\2|\2\+\+)\)[ \t\n]*\{ -> for (\1* const& \2 : \3) { for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?set<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*>::const_iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*(.*)\.begin[ \t\n]*\(\);[ \t\n]*\2[ \t\n]*(?:<|!=)[ \t\n]*\3\.end[ \t\n]*\(\);[ \t\n]*(?:\+\+\2|\2\+\+)\)[ \t\n]*\{ -> for (const \1& \2 : \3) { for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?set<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*\*[ \t\n]*>::const_iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*(.*)->begin[ \t\n]*\(\);[ \t\n]*\2[ \t\n]*(?:<|!=)[ \t\n]*\3->end[ \t\n]*\(\);[ \t\n]*(?:\+\+\2|\2\+\+)\)[ \t\n]*\{ -> for (\1* const& \2 : \3) { for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?set<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*>::const_iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*(.*)->begin[ \t\n]*\(\);[ \t\n]*\2[ \t\n]*(?:<|!=)[ \t\n]*\3->end[ \t\n]*\(\);[ \t\n]*(?:\+\+\2|\2\+\+)\)[ \t\n]*\{ -> for (const \1& \2 : \3) { for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?set<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*\*[ \t\n]*>::const_iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*begin[ \t\n]*\(\);[ \t\n]*\2[ \t\n]*(?:<|!=)[ \t\n]*end[ \t\n]*\(\);[ \t\n]*(?:\+\+\2|\2\+\+)\)[ \t\n]*\{ -> for (\1* const& \2 : *this) { for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?set<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*>::const_iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*begin[ \t\n]*\(\);[ \t\n]*\2[ \t\n]*(?:<|!=)[ \t\n]*end[ \t\n]*\(\);[ \t\n]*(?:\+\+\2|\2\+\+)\)[ \t\n]*\{ -> for (const \1& \2 : *this) { Any dereferencing of the loop internal variable has to be removed manually.

…oop in libs/ Regex substitutions have to be run in the following order: for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?list<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*>::iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*(.*)\.begin[ \t\n]*\(\);[ \t\n]*\2[ \t\n]*(?:<|!=)[ \t\n]*\3\.end[ \t\n]*\(\);[ \t\n]*(?:\+\+\2|\2\+\+)\)[ \t\n]*\{ -> for (\1& \2 : \3) { for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?list<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*>::iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*(.*)->begin[ \t\n]*\(\);[ \t\n]*\2[ \t\n]*(?:<|!=)[ \t\n]*\3->end[ \t\n]*\(\);[ \t\n]*(?:\+\+\2|\2\+\+)\)[ \t\n]*\{ -> for (\1& \2 : *\3) { for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?list<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*>::iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*begin[ \t\n]*\(\);[ \t\n]*\2[ \t\n]*(?:<|!=)[ \t\n]*end[ \t\n]*\(\);[ \t\n]*(?:\+\+\2|\2\+\+)\)[ \t\n]*\{ -> for (\1& \2 : *this) { Any dereferencing of the loop internal variable has to be removed manually.

…each loop in libs/ Regex substitutions have to be run in the following order: for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?list<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*\*[ \t\n]*>::const_iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*(.*)\.begin[ \t\n]*\(\);[ \t\n]*\2[ \t\n]*(?:<|!=)[ \t\n]*\3\.end[ \t\n]*\(\);[ \t\n]*(?:\+\+\2|\2\+\+)\)[ \t\n]*\{ -> for (\1* const& \2 : \3) { for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?list<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*>::const_iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*(.*)\.begin[ \t\n]*\(\);[ \t\n]*\2[ \t\n]*(?:<|!=)[ \t\n]*\3\.end[ \t\n]*\(\);[ \t\n]*(?:\+\+\2|\2\+\+)\)[ \t\n]*\{ -> for (const \1& \2 : \3) { for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?list<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*\*[ \t\n]*>::const_iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*(.*)->begin[ \t\n]*\(\);[ \t\n]*\2[ \t\n]*(?:<|!=)[ \t\n]*\3->end[ \t\n]*\(\);[ \t\n]*(?:\+\+\2|\2\+\+)\)[ \t\n]*\{ -> for (\1* const& \2 : *\3) { for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?list<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*>::const_iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*(.*)->begin[ \t\n]*\(\);[ \t\n]*\2[ \t\n]*(?:<|!=)[ \t\n]*\3->end[ \t\n]*\(\);[ \t\n]*(?:\+\+\2|\2\+\+)\)[ \t\n]*\{ -> for (const \1& \2 : *\3) { for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?list<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*\*[ \t\n]*>::const_iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*begin[ \t\n]*\(\);[ \t\n]*\2[ \t\n]*(?:<|!=)[ \t\n]*end[ \t\n]*\(\);[ \t\n]*(?:\+\+\2|\2\+\+)\)[ \t\n]*\{ -> for (\1* const& \2 : *this) { for[ \t\n]*\([ \t\n]*(?:typename )?[ \t\n]*(?:std::)?list<[ \t\n]*(?:typename )?[ \t\n]*(?:struct )?[ \t\n]*(.*)[ \t\n]*>::const_iterator[ \t\n]+(.*)[ \t\n]*=[ \t\n]*begin[ \t\n]*\(\);[ \t\n]*\2[ \t\n]*(?:<|!=)[ \t\n]*end[ \t\n]*\(\);[ \t\n]*(?:\+\+\2|\2\+\+)\)[ \t\n]*\{ -> for (const \1& \2 : this) { Any dereferencing of the loop internal variable has to be removed manually.

…loop in libs/

pauldavisthefirst reviewed Nov 19, 2024

View reviewed changes

keryell reviewed Nov 20, 2024

View reviewed changes

aledomu mentioned this pull request Nov 21, 2024

Replace loop patterns with std algorithms under libs/ #950

Open

aledomu force-pushed the for-each-libs branch from cadf627 to 4c67991 Compare November 21, 2024 16:28

aledomu added 9 commits November 21, 2024 18:25

Replace for loops with std::slist::iterator into equivalent for-each …

e970725

…loop in libs/

aledomu force-pushed the for-each-libs branch from 4c67991 to e970725 Compare November 21, 2024 22:50

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Replace for-iterator loops with for-each loops and algorithm functions under libs/ #949

Replace for-iterator loops with for-each loops and algorithm functions under libs/ #949

aledomu commented Nov 19, 2024

pauldavisthefirst left a comment

x42 commented Nov 19, 2024

x42 commented Nov 19, 2024

keryell Nov 20, 2024 •

edited

Loading

		for (const std::pair<const string, string>& m : cd_info) {
		node->add_child_nocopy(cd_info_node(m.first, m.second));

Replace for-iterator loops with for-each loops and algorithm functions under libs/ #949

Are you sure you want to change the base?

Replace for-iterator loops with for-each loops and algorithm functions under libs/ #949

Conversation

aledomu commented Nov 19, 2024

pauldavisthefirst left a comment

Choose a reason for hiding this comment

x42 commented Nov 19, 2024

x42 commented Nov 19, 2024

keryell Nov 20, 2024 • edited Loading

Choose a reason for hiding this comment

keryell Nov 20, 2024 •

edited

Loading