Drop make_pair and tidy edge cases in answer smash

Author: doctorlove

Chapter7/Smash.cpp

@@ -33,6 +33,10 @@ std::multimap<std::string, std::string> smashing::load_dictionary(const std::str
 				//dictionary.insert({ key, value }); or
 				dictionary.emplace(key, value);
 			}
+			else
+			{
+				std::cout << "***Invalid line\n" << line << "\nin " << filename << "***\n\n";
+			}
 		}
 	}
 	else
@@ -55,13 +59,17 @@ std::pair<std::string, int> smashing::find_overlapping_word(std::string word,
 		if (lb != dictionary.end() &&
 			stem == lb->first.substr(0, stem.size()))
 		{
-			return std::make_pair(lb->first, offset);
+			return { lb->first, offset };
 		}
 		++offset;
 	}
-	return std::make_pair("", -1);
+	return { "", -1 };
 }
 
+// Could use 
+//#include <format>
+//#include <string_view>
+
 // Listing 7.6 Simple answer smash game
 void smashing::simple_answer_smash(
 	const std::map<std::string, std::string>& keywords,
@@ -70,10 +78,17 @@ void smashing::simple_answer_smash(
 	for (const auto& [word, definition] : keywords)
 	{
 		auto [second_word, offset] = find_overlapping_word(word, dictionary);
+		if (offset == -1)
+		{
+			std::cout << "Not match for " << word << '\n';
+			continue;
+		}
 		std::string second_definition = dictionary.at(second_word);
 		std::cout << definition << "\nAND\n" << second_definition << '\n';
 
 		std::string answer = word.substr(0, offset) + second_word;
+		// Or more efficiently,
+		//std::string answer = std::format("{}{}", std::string_view(word).substr(0, offset), second_word);
 
 		std::string response;
 		std::getline(std::cin, response);

Chapter7/Smash.h

@@ -9,7 +9,8 @@ namespace smashing
 	// Listing 7.11 Select a word from a multimap
 	template <typename T>
 	std::tuple<std::string, std::string, int> select_overlapping_word_from_dictionary(std::string word,
-		const std::multimap<std::string, std::string>& dictionary, T select_function)
+		const std::multimap<std::string, std::string>& dictionary,
+		T select_function)
 	{
 		size_t offset = 1;
 		while (offset < word.size())
@@ -19,11 +20,9 @@ namespace smashing
 			auto beyond_stem = stem;
 			beyond_stem += ('z' + 1);
 			auto ub = dictionary.upper_bound(beyond_stem);
-			if (lb != dictionary.end() &&
-				stem == lb->first.substr(0, stem.size()))
+			if (lb != dictionary.end() && 
+				lb != ub)
 			{
-				if (lb == ub)
-					return { lb->first, lb->second, offset };
 				std::vector<std::pair<std::string, std::string>> dest;
 				select_function(lb, ub, std::back_inserter(dest));
 				auto found = dest[0].first;
@@ -32,7 +31,7 @@ namespace smashing
 			}
 			++offset;
 		}
-		return std::make_tuple("", "",  - 1);
+		return { "", "",  -1 };
 	}
 
 	std::pair<std::string, int> find_overlapping_word(std::string word,

Chapter7/main.cpp

@@ -181,7 +181,7 @@ void hard_coded_game()
 		{"class", "user defined type with private members by default"},
 		{"struct", "user defined type with public members by default"},
 		{"vector", "sequential container supporting dynamic resizing"},
-		{"template", "used for generic code"},
+		{"template", "family of classes or functions parameterized by one or more parameters"},
 	};
 
 	const std::map<std::string, std::string> dictionary{