Shove intRanges unpacking into commons. (#313)

Author: Zemurin

ParserHelpers.cpp

@@ -235,6 +235,32 @@ ullongList::ullongList(std::istream& theStream)
 	parseStream(theStream);
 }
 
+intRange::intRange(std::istream& theStream)
+{
+	registerRegex(integerRegex, [this](const std::string& theInt, [[maybe_unused]] std::istream& unused) {
+		integers.push_back(stringToInteger<int>(theInt));
+	});
+	registerRegex(quotedIntegerRegex, [this](const std::string& theInt, [[maybe_unused]] std::istream& unused) {
+		const auto newInt = theInt.substr(1, theInt.size() - 2);
+		integers.push_back(stringToInteger<int>(newInt));
+	});
+
+	parseStream(theStream);
+	if ((integers.size() % 2) != 0)
+	{
+		throw std::runtime_error("IntRange has an odd number of items. We cannot parse it.");
+	}
+	for (unsigned int i = 0; i < integers.size(); i += 2U)
+	{
+		const int startingInt = integers[i];
+		const int additionalInts = integers[i + 1U];
+		for (int j = 0; j <= additionalInts; j++)
+		{
+			rangedIntegers.emplace(startingInt + j);
+		}
+	}
+}
+
 
 singleInt::singleInt(std::istream& theStream)
 {

ParserHelpers.h

@@ -87,6 +87,17 @@ class ullongList: parser
 	std::vector<unsigned long long> ullongs;
 };
 
+class intRange: parser
+{
+  public:
+	explicit intRange(std::istream& theStream);
+
+	[[nodiscard]] std::set<int> getInts() const { return rangedIntegers; }
+
+  private:
+	std::vector<int> integers;
+	std::set<int> rangedIntegers;
+};
 
 class singleInt: parser
 {

tests/ParserHelperTests.cpp

@@ -1286,4 +1286,21 @@ TEST(ParserHelper_Tests, getStringWrapperWorks)
 	const auto str = " = 69.420";
 	std::stringstream input{str}, input2{str};
 	ASSERT_EQ(commonItems::singleString(input).getString(), commonItems::getString(input2));
-}
+}
+
+TEST(ParserHelper_Tests, IntRangeCanBeInputAndUnpacked)
+{
+	std::stringstream input;
+	input << "={ 37330 1 37333 9 37348 1 }\n";
+	const auto theInts = commonItems::intRange(input).getInts();
+
+	EXPECT_THAT(theInts, testing::UnorderedElementsAre(37330, 37331, 37333, 37334, 37335, 37336, 37337, 37338, 37339, 37340, 37341, 37342, 37348, 37349));
+}
+
+TEST(ParserHelper_Tests, IntRangeThrowsExceptionForOddNumberOfItems)
+{
+	std::stringstream input;
+	input << "={37330 1 37333 9 37348 }\n";
+
+	EXPECT_THROW(const auto theInts = commonItems::intRange(input), std::runtime_error);
+}