From 4f851faa917597c3d9e0497b5200591f8e949535 Mon Sep 17 00:00:00 2001 From: est31 Date: Tue, 21 Apr 2015 22:24:23 +0200 Subject: [PATCH] Craftdef refactor Fix style, refactor assert, use '"' instead of "\"", replace code duplicating craftGetItemName, rename iterators. --- src/craftdef.cpp | 485 +++++++++++++++++++++-------------------------- 1 file changed, 217 insertions(+), 268 deletions(-) diff --git a/src/craftdef.cpp b/src/craftdef.cpp index 9ce5faa95..d3ac8a458 100644 --- a/src/craftdef.cpp +++ b/src/craftdef.cpp @@ -39,7 +39,7 @@ inline bool isGroupRecipeStr(const std::string &rec_name) inline u64 getHashForString(const std::string &recipe_str) { - /*errorstream << "Hashing craft string \"" << recipe_str << "\"";*/ + /*errorstream << "Hashing craft string \"" << recipe_str << '"';*/ return murmur_hash_64_ua(recipe_str.data(), recipe_str.length(), 0xdeadbeef); } @@ -75,7 +75,7 @@ static bool inputItemMatchesRecipe(const std::string &inp_name, const std::string &rec_name, IItemDefManager *idef) { // Exact name - if(inp_name == rec_name) + if (inp_name == rec_name) return true; // Group @@ -83,14 +83,14 @@ static bool inputItemMatchesRecipe(const std::string &inp_name, const struct ItemDefinition &def = idef->get(inp_name); Strfnd f(rec_name.substr(6)); bool all_groups_match = true; - do{ + do { std::string check_group = f.next(","); - if(itemgroup_get(def.groups, check_group) == 0){ + if (itemgroup_get(def.groups, check_group) == 0) { all_groups_match = false; break; } - }while(!f.atend()); - if(all_groups_match) + } while (!f.atend()); + if (all_groups_match) return true; } @@ -111,11 +111,10 @@ static std::vector craftGetItemNames( const std::vector &itemstrings, IGameDef *gamedef) { std::vector result; - for(std::vector::const_iterator - i = itemstrings.begin(); - i != itemstrings.end(); i++) - { - result.push_back(craftGetItemName(*i, gamedef)); + for (std::vector::const_iterator + it = itemstrings.begin(); + it != itemstrings.end(); it++) { + result.push_back(craftGetItemName(*it, gamedef)); } return result; } @@ -125,11 +124,10 @@ static std::vector craftGetItemNames( const std::vector &items, IGameDef *gamedef) { std::vector result; - for(std::vector::const_iterator - i = items.begin(); - i != items.end(); i++) - { - result.push_back(i->name); + for (std::vector::const_iterator + it = items.begin(); + it != items.end(); it++) { + result.push_back(it->name); } return result; } @@ -139,11 +137,11 @@ static std::vector craftGetItems( const std::vector &items, IGameDef *gamedef) { std::vector result; - for(std::vector::const_iterator - i = items.begin(); - i != items.end(); i++) - { - result.push_back(ItemStack(std::string(*i),(u16)1,(u16)0,"",gamedef->getItemDefManager())); + for (std::vector::const_iterator + it = items.begin(); + it != items.end(); it++) { + result.push_back(ItemStack(std::string(*it), (u16)1, + (u16)0, "", gamedef->getItemDefManager())); } return result; } @@ -157,32 +155,27 @@ static bool craftGetBounds(const std::vector &items, unsigned int w bool success = false; unsigned int x = 0; unsigned int y = 0; - for(std::vector::const_iterator - i = items.begin(); - i != items.end(); i++) - { - if(*i != "") // Is this an actual item? - { - if(!success) - { + for (std::vector::const_iterator + it = items.begin(); + it != items.end(); it++) { + // Is this an actual item? + if (*it != "") { + if (!success) { // This is the first nonempty item min_x = max_x = x; min_y = max_y = y; success = true; - } - else - { - if(x < min_x) min_x = x; - if(x > max_x) max_x = x; - if(y < min_y) min_y = y; - if(y > max_y) max_y = y; + } else { + if (x < min_x) min_x = x; + if (x > max_x) max_x = x; + if (y < min_y) min_y = y; + if (y > max_y) max_y = y; } } // Step coordinate x++; - if(x == width) - { + if (x == width) { x = 0; y++; } @@ -193,12 +186,11 @@ 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::iterator - i = input.items.begin(); - i != input.items.end(); i++) - { - if(i->count != 0) - i->remove(1); + for (std::vector::iterator + it = input.items.begin(); + it != input.items.end(); it++) { + if (it->count != 0) + it->remove(1); } } @@ -209,8 +201,7 @@ static void craftDecrementOrReplaceInput(CraftInput &input, const CraftReplacements &replacements, IGameDef *gamedef) { - if(replacements.pairs.empty()) - { + if (replacements.pairs.empty()) { craftDecrementInput(input, gamedef); return; } @@ -218,36 +209,28 @@ static void craftDecrementOrReplaceInput(CraftInput &input, // Make a copy of the replacements pair list std::vector > pairs = replacements.pairs; - for(std::vector::iterator - i = input.items.begin(); - i != input.items.end(); i++) - { - if(i->count == 1) - { + for (std::vector::iterator + it = input.items.begin(); + it != input.items.end(); it++) { + if (it->count == 1) { // Find an appropriate replacement bool found_replacement = false; - for(std::vector >::iterator + for (std::vector >::iterator j = pairs.begin(); - j != pairs.end(); j++) - { - ItemStack from_item; - from_item.deSerialize(j->first, gamedef->idef()); - if(i->name == from_item.name) - { - i->deSerialize(j->second, gamedef->idef()); + j != pairs.end(); j++) { + if (it->name == craftGetItemName(j->first, gamedef)) { + it->deSerialize(j->second, gamedef->idef()); found_replacement = true; pairs.erase(j); break; } } // No replacement was found, simply decrement count to zero - if(!found_replacement) - i->remove(1); - } - else if(i->count >= 2) - { + if (!found_replacement) + it->remove(1); + } else if (it->count >= 2) { // Ignore replacements for items with count >= 2 - i->remove(1); + it->remove(1); } } } @@ -260,21 +243,17 @@ static std::string craftDumpMatrix(const std::vector &items, os<<"{ "; unsigned int x = 0; for(std::vector::const_iterator - i = items.begin(); - i != items.end(); i++, x++) - { - if(x == width) - { + it = items.begin(); + it != items.end(); it++, x++) { + if (x == width) { os<<"; "; x = 0; - } - else if(x != 0) - { + } else if (x != 0) { os<<","; } - os<<"\""<<(*i)<<"\""; + os << '"' << (*it) << '"'; } - os<<" }"; + os << " }"; return os.str(); } @@ -283,24 +262,20 @@ std::string craftDumpMatrix(const std::vector &items, unsigned int width) { std::ostringstream os(std::ios::binary); - os<<"{ "; + os << "{ "; unsigned int x = 0; - for(std::vector::const_iterator - i = items.begin(); - i != items.end(); i++, x++) - { - if(x == width) - { - os<<"; "; + for (std::vector::const_iterator + it = items.begin(); + it != items.end(); it++, x++) { + if (x == width) { + os << "; "; x = 0; - } - else if(x != 0) - { + } else if (x != 0) { os<<","; } - os<<"\""<<(i->getItemString())<<"\""; + os << '"' << (it->getItemString()) << '"'; } - os<<" }"; + os << " }"; return os.str(); } @@ -312,7 +287,8 @@ std::string craftDumpMatrix(const std::vector &items, std::string CraftInput::dump() const { std::ostringstream os(std::ios::binary); - os<<"(method="<<((int)method)<<", items="< >::const_iterator - i = pairs.begin(); - i != pairs.end(); i++) - { - os<first)<<"\"=>\""<<(i->second)<<"\""; + for (std::vector >::const_iterator + it = pairs.begin(); + it != pairs.end(); it++) { + os << sep << '"' << (it->first) << "\"=>\"" << (it->second) << '"'; sep = ","; } - os<<"}"; + os << "}"; return os.str(); } void CraftReplacements::serialize(std::ostream &os) const { writeU16(os, pairs.size()); - for(u32 i=0; ideSerializeBody(is, version); return def; @@ -427,20 +390,21 @@ std::string CraftDefinitionShaped::getName() const bool CraftDefinitionShaped::check(const CraftInput &input, IGameDef *gamedef) const { - if(input.method != CRAFT_METHOD_NORMAL) + if (input.method != CRAFT_METHOD_NORMAL) return false; // Get input item matrix std::vector inp_names = craftGetItemNames(input.items, gamedef); unsigned int inp_width = input.width; - if(inp_width == 0) + if (inp_width == 0) return false; - while(inp_names.size() % inp_width != 0) + while (inp_names.size() % inp_width != 0) inp_names.push_back(""); // Get input bounds - unsigned int inp_min_x=0, inp_max_x=0, inp_min_y=0, inp_max_y=0; - if(!craftGetBounds(inp_names, inp_width, inp_min_x, inp_max_x, inp_min_y, inp_max_y)) + unsigned int inp_min_x = 0, inp_max_x = 0, inp_min_y = 0, inp_max_y = 0; + if (!craftGetBounds(inp_names, inp_width, inp_min_x, inp_max_x, + inp_min_y, inp_max_y)) return false; // it was empty std::vector rec_names; @@ -451,18 +415,19 @@ bool CraftDefinitionShaped::check(const CraftInput &input, IGameDef *gamedef) co // Get recipe item matrix unsigned int rec_width = width; - if(rec_width == 0) + if (rec_width == 0) return false; - while(rec_names.size() % rec_width != 0) + while (rec_names.size() % rec_width != 0) rec_names.push_back(""); // Get recipe bounds unsigned int rec_min_x=0, rec_max_x=0, rec_min_y=0, rec_max_y=0; - if(!craftGetBounds(rec_names, rec_width, rec_min_x, rec_max_x, rec_min_y, rec_max_y)) + if (!craftGetBounds(rec_names, rec_width, rec_min_x, rec_max_x, + rec_min_y, rec_max_y)) return false; // it was empty // Different sizes? - if(inp_max_x - inp_min_x != rec_max_x - rec_min_x || + if (inp_max_x - inp_min_x != rec_max_x - rec_min_x || inp_max_y - inp_min_y != rec_max_y - rec_min_y) return false; @@ -470,18 +435,17 @@ bool CraftDefinitionShaped::check(const CraftInput &input, IGameDef *gamedef) co unsigned int w = inp_max_x - inp_min_x + 1; unsigned int h = inp_max_y - inp_min_y + 1; - for(unsigned int y=0; y < h; y++) { + for (unsigned int y=0; y < h; y++) { unsigned int inp_y = (inp_min_y + y) * inp_width; unsigned int rec_y = (rec_min_y + y) * rec_width; - for(unsigned int x=0; x < w; x++) { + for (unsigned int x=0; x < w; x++) { unsigned int inp_x = inp_min_x + x; unsigned int rec_x = rec_min_x + x; - if(!inputItemMatchesRecipe( + if (!inputItemMatchesRecipe( inp_names[inp_y + inp_x], - rec_names[rec_y + rec_x], gamedef->idef()) - ) { + rec_names[rec_y + rec_x], gamedef->idef())) { return false; } } @@ -507,7 +471,7 @@ void CraftDefinitionShaped::decrementInput(CraftInput &input, IGameDef *gamedef) CraftHashType CraftDefinitionShaped::getHashType() const { - assert(hash_inited); //pre-condition + assert(hash_inited); // Pre-condition bool has_group = false; for (size_t i = 0; i < recipe_names.size(); i++) { if (isGroupRecipeStr(recipe_names[i])) { @@ -523,16 +487,13 @@ CraftHashType CraftDefinitionShaped::getHashType() const u64 CraftDefinitionShaped::getHash(CraftHashType type) const { - assert(hash_inited); //pre-condition - if ((type == CRAFT_HASH_TYPE_ITEM_NAMES) || (type == CRAFT_HASH_TYPE_COUNT)) { - std::vector rec_names = recipe_names; - std::sort(rec_names.begin(), rec_names.end()); - return getHashForGrid(type, rec_names); - } else { - //illegal hash type for this CraftDefinition (pre-condition) - assert(false); - return 0; - } + assert(hash_inited); // Pre-condition + assert((type == CRAFT_HASH_TYPE_ITEM_NAMES) + || (type == CRAFT_HASH_TYPE_COUNT)); // Pre-condition + + std::vector rec_names = recipe_names; + std::sort(rec_names.begin(), rec_names.end()); + return getHashForGrid(type, rec_names); } void CraftDefinitionShaped::initHash(IGameDef *gamedef) @@ -546,31 +507,31 @@ void CraftDefinitionShaped::initHash(IGameDef *gamedef) std::string CraftDefinitionShaped::dump() const { std::ostringstream os(std::ios::binary); - os<<"(shaped, output=\""< input_filtered; - for(std::vector::const_iterator - i = input.items.begin(); - i != input.items.end(); i++) - { - if(i->name != "") - input_filtered.push_back(i->name); + for (std::vector::const_iterator + it = input.items.begin(); + it != input.items.end(); it++) { + if (it->name != "") + input_filtered.push_back(it->name); } // If there is a wrong number of items in input, no match - if(input_filtered.size() != recipe.size()){ + if (input_filtered.size() != recipe.size()) { /*dstream<<"Number of input items ("<idef())){ + if (!inputItemMatchesRecipe(input_filtered[i], recipe_copy[i], + gamedef->idef())) { all_match = false; break; } } //dstream<<" -> match="<idef(); - if(item1.count != 1 || item2.count != 1 || item1.name != item2.name + if (item1.count != 1 || item2.count != 1 || item1.name != item2.name || idef->get(item1.name).type != ITEM_TOOL - || idef->get(item2.name).type != ITEM_TOOL) - { + || idef->get(item2.name).type != ITEM_TOOL) { // Failure return ItemStack(); } @@ -743,9 +698,9 @@ static ItemStack craftToolRepair( s32 item2_uses = 65536 - (u32) item2.wear; s32 new_uses = item1_uses + item2_uses; s32 new_wear = 65536 - new_uses + floor(additional_wear * 65536 + 0.5); - if(new_wear >= 65536) + if (new_wear >= 65536) return ItemStack(); - if(new_wear < 0) + if (new_wear < 0) new_wear = 0; ItemStack repaired = item1; @@ -760,21 +715,19 @@ std::string CraftDefinitionToolRepair::getName() const bool CraftDefinitionToolRepair::check(const CraftInput &input, IGameDef *gamedef) const { - if(input.method != CRAFT_METHOD_NORMAL) + if (input.method != CRAFT_METHOD_NORMAL) return false; ItemStack item1; ItemStack item2; - for(std::vector::const_iterator - i = input.items.begin(); - i != input.items.end(); i++) - { - if(!i->empty()) - { - if(item1.empty()) - item1 = *i; - else if(item2.empty()) - item2 = *i; + for (std::vector::const_iterator + it = input.items.begin(); + it != input.items.end(); it++) { + if (!it->empty()) { + if (item1.empty()) + item1 = *it; + else if (item2.empty()) + item2 = *it; else return false; } @@ -787,16 +740,14 @@ CraftOutput CraftDefinitionToolRepair::getOutput(const CraftInput &input, IGameD { ItemStack item1; ItemStack item2; - for(std::vector::const_iterator - i = input.items.begin(); - i != input.items.end(); i++) - { - if(!i->empty()) - { - if(item1.empty()) - item1 = *i; - else if(item2.empty()) - item2 = *i; + for (std::vector::const_iterator + it = input.items.begin(); + it != input.items.end(); it++) { + if (!it->empty()) { + if (item1.empty()) + item1 = *it; + else if (item2.empty()) + item2 = *it; } } ItemStack repaired = craftToolRepair(item1, item2, additional_wear, gamedef); @@ -807,7 +758,7 @@ CraftInput CraftDefinitionToolRepair::getInput(const CraftOutput &output, IGameD { std::vector stack; stack.push_back(ItemStack()); - return CraftInput(CRAFT_METHOD_COOKING,additional_wear,stack); + return CraftInput(CRAFT_METHOD_COOKING, additional_wear, stack); } void CraftDefinitionToolRepair::decrementInput(CraftInput &input, IGameDef *gamedef) const @@ -818,7 +769,7 @@ void CraftDefinitionToolRepair::decrementInput(CraftInput &input, IGameDef *game std::string CraftDefinitionToolRepair::dump() const { std::ostringstream os(std::ios::binary); - os<<"(toolrepair, additional_wear="< input_filtered; - for(std::vector::const_iterator - i = input.items.begin(); - i != input.items.end(); i++) - { - if(i->name != "") - input_filtered.push_back(i->name); + for (std::vector::const_iterator + it = input.items.begin(); + it != input.items.end(); it++) { + if (it->name != "") + input_filtered.push_back(it->name); } // If there is a wrong number of items in input, no match - if(input_filtered.size() != 1){ + if (input_filtered.size() != 1) { /*dstream<<"Number of input items ("< input_filtered; - for(std::vector::const_iterator - i = input.items.begin(); - i != input.items.end(); i++) - { - if(i->name != "") - input_filtered.push_back(i->name); + for (std::vector::const_iterator + it = input.items.begin(); + it != input.items.end(); it++) { + if (it->name != "") + input_filtered.push_back(it->name); } // If there is a wrong number of items in input, no match - if(input_filtered.size() != 1){ + if (input_filtered.size() != 1) { /*dstream<<"Number of input items ("<::const_iterator - i = input.items.begin(); - i != input.items.end(); i++) { - if (!i->empty()) { + it = input.items.begin(); + it != input.items.end(); it++) { + if (!it->empty()) { all_empty = false; break; } @@ -1108,9 +1057,9 @@ public: // Walk crafting definitions from back to front, so that later // definitions can override earlier ones. for (std::vector::const_reverse_iterator - i = hash_collisions.rbegin(); - i != hash_collisions.rend(); i++) { - CraftDefinition *def = *i; + it = hash_collisions.rbegin(); + it != hash_collisions.rend(); it++) { + CraftDefinition *def = *it; /*errorstream << "Checking " << input.dump() << std::endl << " against " << def->dump() << std::endl;*/ @@ -1158,11 +1107,11 @@ public: os << "Crafting definitions:\n"; for (int type = 0; type <= craft_hash_type_max; type++) { for (std::map >::const_iterator - i = (m_craft_defs[type]).begin(); - i != (m_craft_defs[type]).end(); i++) { + it = (m_craft_defs[type]).begin(); + it != (m_craft_defs[type]).end(); it++) { for (std::vector::const_iterator - ii = i->second.begin(); ii != i->second.end(); ii++) { - os << "type " << type << " hash " << i->first << (*ii)->dump() << "\n"; + iit = it->second.begin(); iit != it->second.end(); iit++) { + os << "type " << type << " hash " << it->first << (*iit)->dump() << "\n"; } } } @@ -1170,8 +1119,8 @@ public: } virtual void registerCraft(CraftDefinition *def, IGameDef *gamedef) { - verbosestream<<"registerCraft: registering craft definition: " - <dump()<dump() << std::endl; m_craft_defs[(int) CRAFT_HASH_TYPE_UNHASHED][0].push_back(def); CraftInput input; @@ -1183,13 +1132,13 @@ public: { for (int type = 0; type <= craft_hash_type_max; type++) { for (std::map >::iterator - i = m_craft_defs[type].begin(); - i != m_craft_defs[type].end(); i++) { + it = m_craft_defs[type].begin(); + it != m_craft_defs[type].end(); it++) { for (std::vector::iterator - ii = i->second.begin(); ii != i->second.end(); ii++) { - delete *ii; + iit = it->second.begin(); iit != it->second.end(); iit++) { + delete *iit; } - i->second.clear(); + it->second.clear(); } m_craft_defs[type].clear(); } @@ -1199,9 +1148,9 @@ public: { // Move the CraftDefs from the unhashed layer into layers higher up. for (std::vector::iterator - i = (m_craft_defs[(int) CRAFT_HASH_TYPE_UNHASHED][0]).begin(); - i != (m_craft_defs[(int) CRAFT_HASH_TYPE_UNHASHED][0]).end(); i++) { - CraftDefinition *def = *i; + it = (m_craft_defs[(int) CRAFT_HASH_TYPE_UNHASHED][0]).begin(); + it != (m_craft_defs[(int) CRAFT_HASH_TYPE_UNHASHED][0]).end(); it++) { + CraftDefinition *def = *it; // Initialize and get the definition's hash def->initHash(gamedef);