Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaksim Andrianov <maksimandrianov1@gmail.com>2021-03-12 12:02:08 +0300
committerTatiana Yan <tatiana.kondakova@gmail.com>2021-03-12 16:50:19 +0300
commit43dc660132eb8add2eada5a3d9297cca90ed929e (patch)
tree206a1fc0eff717c5d2307de612340eb9117e1b8a
parent39ec5f79a9a519929f7208cb70ba581288f1cf33 (diff)
[generator] SimpleTokenizer -> SimpleTokenizerWithEmptyTokens
-rw-r--r--generator/road_access_generator.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/generator/road_access_generator.cpp b/generator/road_access_generator.cpp
index 856ceb1123..72167358d7 100644
--- a/generator/road_access_generator.cpp
+++ b/generator/road_access_generator.cpp
@@ -285,30 +285,30 @@ void ParseRoadAccessConditional(
VehicleType vehicleType = VehicleType::Count;
while (getline(stream, line))
{
- using It = strings::SimpleTokenizer;
+ using It = strings::SimpleTokenizerWithEmptyTokens;
It strIt(line, strings::SimpleDelimiter('\t'));
- CHECK(strIt, ());
+ CHECK(strIt, (line));
buffer = *strIt;
strings::Trim(buffer);
FromString(buffer, vehicleType);
- CHECK_NOT_EQUAL(vehicleType, VehicleType::Count, (buffer));
+ CHECK_NOT_EQUAL(vehicleType, VehicleType::Count, (line, buffer));
auto const moveIterAndCheck = [&]() {
++strIt;
- CHECK(strIt, ());
+ CHECK(strIt, (line));
return *strIt;
};
uint64_t osmId = 0;
buffer = moveIterAndCheck();
strings::Trim(buffer);
- CHECK(strings::to_uint64(buffer, osmId), (buffer));
+ CHECK(strings::to_uint64(buffer, osmId), (line, buffer));
size_t accessNumber = 0;
buffer = moveIterAndCheck();
strings::Trim(buffer);
- CHECK(strings::to_size_t(buffer, accessNumber), (buffer));
- CHECK_NOT_EQUAL(accessNumber, 0, ());
+ CHECK(strings::to_size_t(buffer, accessNumber), (line, buffer));
+ CHECK_NOT_EQUAL(accessNumber, 0, (line));
RoadAccess::Conditional conditional;
for (size_t i = 0; i < accessNumber; ++i)
{
@@ -316,7 +316,7 @@ void ParseRoadAccessConditional(
strings::Trim(buffer);
RoadAccess::Type roadAccessType = RoadAccess::Type::Count;
FromString(buffer, roadAccessType);
- CHECK_NOT_EQUAL(roadAccessType, RoadAccess::Type::Count, ());
+ CHECK_NOT_EQUAL(roadAccessType, RoadAccess::Type::Count, (line));
buffer = moveIterAndCheck();
strings::Trim(buffer);