From 13e995b811e80dc48c0769274d3dca3a2221b843 Mon Sep 17 00:00:00 2001 From: Loïc Blot Date: Thu, 17 Aug 2017 23:02:50 +0200 Subject: Modernize src/c* src/d* and src/e* files (#6263) * Modernize src/c* src/d* and src/e* files * default operator * redundant init * delete default constructors on CraftDefinition childs (never used) * fix some missing init values * const ref fix reported by clang-tidy * ranged-based for loops * simple conditions & returns * empty stl function instead of size * emplace_back stl function instead of push_back + construct temp obj * auto for some iterators * code style fixes * c++ stl headers instead of C stl headers (stdio.h -> cstdio) --- src/craftdef.cpp | 183 +++++++++++++++++++++++-------------------------------- 1 file changed, 76 insertions(+), 107 deletions(-) (limited to 'src/craftdef.cpp') diff --git a/src/craftdef.cpp b/src/craftdef.cpp index 286d1eada..faec1d6f4 100644 --- a/src/craftdef.cpp +++ b/src/craftdef.cpp @@ -50,7 +50,7 @@ static u64 getHashForGrid(CraftHashType type, const std::vector &gr std::ostringstream os; bool is_first = true; for (size_t i = 0; i < grid_names.size(); i++) { - if (grid_names[i] != "") { + if (!grid_names[i].empty()) { os << (is_first ? "" : "\n") << grid_names[i]; is_first = false; } @@ -59,7 +59,7 @@ static u64 getHashForGrid(CraftHashType type, const std::vector &gr } case CRAFT_HASH_TYPE_COUNT: { u64 cnt = 0; for (size_t i = 0; i < grid_names.size(); i++) - if (grid_names[i] != "") + if (!grid_names[i].empty()) cnt++; return cnt; } case CRAFT_HASH_TYPE_UNHASHED: @@ -112,9 +112,8 @@ static std::vector craftGetItemNames( const std::vector &itemstrings, IGameDef *gamedef) { std::vector result; - for (std::vector::size_type i = 0; - i < itemstrings.size(); i++) { - result.push_back(craftGetItemName(itemstrings[i], gamedef)); + for (const auto &itemstring : itemstrings) { + result.push_back(craftGetItemName(itemstring, gamedef)); } return result; } @@ -124,9 +123,8 @@ static std::vector craftGetItemNames( const std::vector &items, IGameDef *gamedef) { std::vector result; - for (std::vector::size_type i = 0; - i < items.size(); i++) { - result.push_back(items[i].name); + for (const auto &item : items) { + result.push_back(item.name); } return result; } @@ -136,10 +134,9 @@ static std::vector craftGetItems( const std::vector &items, IGameDef *gamedef) { std::vector result; - for (std::vector::size_type i = 0; - i < items.size(); i++) { - result.push_back(ItemStack(std::string(items[i]), (u16)1, - (u16)0, gamedef->getItemDefManager())); + for (const auto &item : items) { + result.emplace_back(std::string(item), (u16)1, + (u16)0, gamedef->getItemDefManager()); } return result; } @@ -156,7 +153,7 @@ static bool craftGetBounds(const std::vector &items, unsigned int w for (std::vector::size_type i = 0; i < items.size(); i++) { // Is this an actual item? - if (items[i] != "") { + if (!items[i].empty()) { if (!success) { // This is the first nonempty item min_x = max_x = x; @@ -183,10 +180,9 @@ static bool craftGetBounds(const std::vector &items, unsigned int w // Removes 1 from each item stack static void craftDecrementInput(CraftInput &input, IGameDef *gamedef) { - for (std::vector::size_type i = 0; - i < input.items.size(); i++) { - if (input.items[i].count != 0) - input.items[i].remove(1); + for (auto &item : input.items) { + if (item.count != 0) + item.remove(1); } } @@ -206,28 +202,25 @@ static void craftDecrementOrReplaceInput(CraftInput &input, // Make a copy of the replacements pair list std::vector > pairs = replacements.pairs; - for (std::vector::size_type i = 0; - i < input.items.size(); i++) { - ItemStack &item = input.items[i]; + for (auto &item : input.items) { // Find an appropriate replacement bool found_replacement = false; - for (std::vector >::iterator - j = pairs.begin(); - j != pairs.end(); ++j) { + for (auto j = pairs.begin(); j != pairs.end(); ++j) { if (inputItemMatchesRecipe(item.name, j->first, gamedef->idef())) { if (item.count == 1) { item.deSerialize(j->second, gamedef->idef()); found_replacement = true; pairs.erase(j); break; - } else { - ItemStack rep; - rep.deSerialize(j->second, gamedef->idef()); - item.remove(1); - found_replacement = true; - output_replacements.push_back(rep); - break; } + + ItemStack rep; + rep.deSerialize(j->second, gamedef->idef()); + item.remove(1); + found_replacement = true; + output_replacements.push_back(rep); + break; + } } // No replacement was found, simply decrement count by one @@ -311,9 +304,7 @@ std::string CraftReplacements::dump() const std::ostringstream os(std::ios::binary); os<<"{"; const char *sep = ""; - for (std::vector >::size_type i = 0; - i < pairs.size(); i++) { - const std::pair &repl_p = pairs[i]; + for (const auto &repl_p : pairs) { os << sep << '"' << (repl_p.first) << "\"=>\"" << (repl_p.second) << '"'; @@ -343,7 +334,7 @@ bool CraftDefinitionShaped::check(const CraftInput &input, IGameDef *gamedef) co if (inp_width == 0) return false; while (inp_names.size() % inp_width != 0) - inp_names.push_back(""); + inp_names.emplace_back(""); // Get input bounds unsigned int inp_min_x = 0, inp_max_x = 0, inp_min_y = 0, inp_max_y = 0; @@ -362,7 +353,7 @@ bool CraftDefinitionShaped::check(const CraftInput &input, IGameDef *gamedef) co if (rec_width == 0) return false; while (rec_names.size() % rec_width != 0) - rec_names.push_back(""); + rec_names.emplace_back(""); // Get recipe bounds unsigned int rec_min_x=0, rec_max_x=0, rec_min_y=0, rec_max_y=0; @@ -418,16 +409,16 @@ CraftHashType CraftDefinitionShaped::getHashType() const { assert(hash_inited); // Pre-condition bool has_group = false; - for (size_t i = 0; i < recipe_names.size(); i++) { - if (isGroupRecipeStr(recipe_names[i])) { + for (const auto &recipe_name : recipe_names) { + if (isGroupRecipeStr(recipe_name)) { has_group = true; break; } } if (has_group) return CRAFT_HASH_TYPE_COUNT; - else - return CRAFT_HASH_TYPE_ITEM_NAMES; + + return CRAFT_HASH_TYPE_ITEM_NAMES; } u64 CraftDefinitionShaped::getHash(CraftHashType type) const @@ -474,10 +465,8 @@ bool CraftDefinitionShapeless::check(const CraftInput &input, IGameDef *gamedef) // Filter empty items out of input std::vector input_filtered; - for (std::vector::size_type i = 0; - i < input.items.size(); i++) { - const ItemStack &item = input.items[i]; - if (item.name != "") + for (const auto &item : input.items) { + if (!item.name.empty()) input_filtered.push_back(item.name); } @@ -540,16 +529,16 @@ CraftHashType CraftDefinitionShapeless::getHashType() const { assert(hash_inited); // Pre-condition bool has_group = false; - for (size_t i = 0; i < recipe_names.size(); i++) { - if (isGroupRecipeStr(recipe_names[i])) { + for (const auto &recipe_name : recipe_names) { + if (isGroupRecipeStr(recipe_name)) { has_group = true; break; } } if (has_group) return CRAFT_HASH_TYPE_COUNT; - else - return CRAFT_HASH_TYPE_ITEM_NAMES; + + return CRAFT_HASH_TYPE_ITEM_NAMES; } u64 CraftDefinitionShapeless::getHash(CraftHashType type) const @@ -622,9 +611,7 @@ bool CraftDefinitionToolRepair::check(const CraftInput &input, IGameDef *gamedef ItemStack item1; ItemStack item2; - for (std::vector::size_type i = 0; - i < input.items.size(); i++) { - const ItemStack &item = input.items[i]; + for (const auto &item : input.items) { if (!item.empty()) { if (item1.empty()) item1 = item; @@ -642,9 +629,7 @@ CraftOutput CraftDefinitionToolRepair::getOutput(const CraftInput &input, IGameD { ItemStack item1; ItemStack item2; - for (std::vector::size_type i = 0; - i < input.items.size(); i++) { - const ItemStack &item = input.items[i]; + for (const auto &item : input.items) { if (!item.empty()) { if (item1.empty()) item1 = item; @@ -659,7 +644,7 @@ CraftOutput CraftDefinitionToolRepair::getOutput(const CraftInput &input, IGameD CraftInput CraftDefinitionToolRepair::getInput(const CraftOutput &output, IGameDef *gamedef) const { std::vector stack; - stack.push_back(ItemStack()); + stack.emplace_back(); return CraftInput(CRAFT_METHOD_COOKING, additional_wear, stack); } @@ -692,10 +677,9 @@ bool CraftDefinitionCooking::check(const CraftInput &input, IGameDef *gamedef) c // Filter empty items out of input std::vector input_filtered; - for (std::vector::size_type i = 0; - i < input.items.size(); i++) { - const std::string &name = input.items[i].name; - if (name != "") + for (const auto &item : input.items) { + const std::string &name = item.name; + if (!name.empty()) input_filtered.push_back(name); } @@ -733,15 +717,16 @@ CraftHashType CraftDefinitionCooking::getHashType() const { if (isGroupRecipeStr(recipe_name)) return CRAFT_HASH_TYPE_COUNT; - else - return CRAFT_HASH_TYPE_ITEM_NAMES; + + return CRAFT_HASH_TYPE_ITEM_NAMES; } u64 CraftDefinitionCooking::getHash(CraftHashType type) const { if (type == CRAFT_HASH_TYPE_ITEM_NAMES) { return getHashForString(recipe_name); - } else if (type == CRAFT_HASH_TYPE_COUNT) { + } + if (type == CRAFT_HASH_TYPE_COUNT) { return 1; } else { //illegal hash type for this CraftDefinition (pre-condition) @@ -784,10 +769,9 @@ bool CraftDefinitionFuel::check(const CraftInput &input, IGameDef *gamedef) cons // Filter empty items out of input std::vector input_filtered; - for (std::vector::size_type i = 0; - i < input.items.size(); i++) { - const std::string &name = input.items[i].name; - if (name != "") + for (const auto &item : input.items) { + const std::string &name = item.name; + if (!name.empty()) input_filtered.push_back(name); } @@ -825,15 +809,17 @@ CraftHashType CraftDefinitionFuel::getHashType() const { if (isGroupRecipeStr(recipe_name)) return CRAFT_HASH_TYPE_COUNT; - else - return CRAFT_HASH_TYPE_ITEM_NAMES; + + return CRAFT_HASH_TYPE_ITEM_NAMES; } u64 CraftDefinitionFuel::getHash(CraftHashType type) const { if (type == CRAFT_HASH_TYPE_ITEM_NAMES) { return getHashForString(recipe_name); - } else if (type == CRAFT_HASH_TYPE_COUNT) { + } + + if (type == CRAFT_HASH_TYPE_COUNT) { return 1; } else { //illegal hash type for this CraftDefinition (pre-condition) @@ -884,9 +870,8 @@ public: // If all input items are empty, abort. bool all_empty = true; - for (std::vector::size_type i = 0; - i < input.items.size(); i++) { - if (!input.items[i].empty()) { + for (const auto &item : input.items) { + if (!item.empty()) { all_empty = false; break; } @@ -906,8 +891,7 @@ public: // We'd like to do "const [...] hash_collisions = m_craft_defs[type][hash];" // but that doesn't compile for some reason. This does. - std::map >::const_iterator - col_iter = (m_craft_defs[type]).find(hash); + auto col_iter = (m_craft_defs[type]).find(hash); if (col_iter == (m_craft_defs[type]).end()) continue; @@ -940,8 +924,7 @@ public: { std::vector recipes; - std::map >::const_iterator - vec_iter = m_output_craft_definitions.find(output.item); + auto vec_iter = m_output_craft_definitions.find(output.item); if (vec_iter == m_output_craft_definitions.end()) return recipes; @@ -963,26 +946,22 @@ public: virtual bool clearCraftRecipesByOutput(const CraftOutput &output, IGameDef *gamedef) { - std::map >::iterator vec_iter = - m_output_craft_definitions.find(output.item); + auto vec_iter = m_output_craft_definitions.find(output.item); if (vec_iter == m_output_craft_definitions.end()) return false; std::vector &vec = vec_iter->second; - for (std::vector::iterator i = vec.begin(); - i != vec.end(); ++i) { - CraftDefinition *def = *i; + for (auto def : vec) { // Recipes are not yet hashed at this point std::vector &unhashed_inputs_vec = m_craft_defs[(int) CRAFT_HASH_TYPE_UNHASHED][0]; std::vector new_vec_by_input; /* We will preallocate necessary memory addresses, so we don't need to reallocate them later. This would save us some performance. */ new_vec_by_input.reserve(unhashed_inputs_vec.size()); - for (std::vector::iterator i2 = unhashed_inputs_vec.begin(); - i2 != unhashed_inputs_vec.end(); ++i2) { - if (def != *i2) { - new_vec_by_input.push_back(*i2); + for (auto &i2 : unhashed_inputs_vec) { + if (def != i2) { + new_vec_by_input.push_back(i2); } } m_craft_defs[(int) CRAFT_HASH_TYPE_UNHASHED][0].swap(new_vec_by_input); @@ -995,9 +974,8 @@ public: const std::vector &recipe, IGameDef *gamedef) { bool all_empty = true; - for (std::vector::size_type i = 0; - i < recipe.size(); i++) { - if (!recipe[i].empty()) { + for (const auto &i : recipe) { + if (!i.empty()) { all_empty = false; break; } @@ -1021,8 +999,7 @@ public: } CraftOutput output = def->getOutput(input, gamedef); got_hit = true; - std::map >::iterator - vec_iter = m_output_craft_definitions.find(output.item); + auto vec_iter = m_output_craft_definitions.find(output.item); if (vec_iter == m_output_craft_definitions.end()) continue; std::vector &vec = vec_iter->second; @@ -1030,14 +1007,13 @@ public: /* We will preallocate necessary memory addresses, so we don't need to reallocate them later. This would save us some performance. */ new_vec_by_output.reserve(vec.size()); - for (std::vector::iterator i = vec.begin(); - i != vec.end(); ++i) { + for (auto &vec_i : vec) { /* If pointers from map by input and output are not same, we will add 'CraftDefinition*' to a new vector. */ - if (def != *i) { + if (def != vec_i) { /* Adding dereferenced iterator value (which are 'CraftDefinition' reference) to a new vector. */ - new_vec_by_output.push_back(*i); + new_vec_by_output.push_back(vec_i); } } // Swaps assigned to current key value with new vector for output map. @@ -1055,9 +1031,8 @@ public: std::ostringstream os(std::ios::binary); os << "Crafting definitions:\n"; for (int type = 0; type <= craft_hash_type_max; ++type) { - for (std::map >::const_iterator - it = (m_craft_defs[type]).begin(); - it != (m_craft_defs[type]).end(); ++it) { + for (auto it = m_craft_defs[type].begin(); + it != m_craft_defs[type].end(); ++it) { for (std::vector::size_type i = 0; i < it->second.size(); i++) { os << "type " << type @@ -1083,15 +1058,12 @@ public: virtual void clear() { for (int type = 0; type <= craft_hash_type_max; ++type) { - for (std::map >::iterator - it = m_craft_defs[type].begin(); - it != m_craft_defs[type].end(); ++it) { - for (std::vector::iterator - iit = it->second.begin(); - iit != it->second.end(); ++iit) { + for (auto &it : m_craft_defs[type]) { + for (auto iit = it.second.begin(); + iit != it.second.end(); ++iit) { delete *iit; } - it->second.clear(); + it.second.clear(); } m_craft_defs[type].clear(); } @@ -1102,10 +1074,7 @@ public: // Move the CraftDefs from the unhashed layer into layers higher up. std::vector &unhashed = m_craft_defs[(int) CRAFT_HASH_TYPE_UNHASHED][0]; - for (std::vector::size_type i = 0; - i < unhashed.size(); i++) { - CraftDefinition *def = unhashed[i]; - + for (auto def : unhashed) { // Initialize and get the definition's hash def->initHash(gamedef); CraftHashType type = def->getHashType(); -- cgit v1.2.3