summaryrefslogtreecommitdiffstats
path: root/util/draft
diff options
context:
space:
mode:
authormvel <[email protected]>2022-02-10 16:45:41 +0300
committerDaniil Cherednik <[email protected]>2022-02-10 16:45:41 +0300
commitbd30392c4cc92487950adc375c07adf52da1d592 (patch)
treee8d1a3f19b7fc890bcef6e4cc5de41f1d88c9ac3 /util/draft
parent5d50718e66d9c037dc587a0211110b7d25a66185 (diff)
Restoring authorship annotation for <[email protected]>. Commit 1 of 2.
Diffstat (limited to 'util/draft')
-rw-r--r--util/draft/enum.h42
-rw-r--r--util/draft/holder_vector.h2
-rw-r--r--util/draft/holder_vector_ut.cpp4
3 files changed, 24 insertions, 24 deletions
diff --git a/util/draft/enum.h b/util/draft/enum.h
index 18002b7df20..9778cbc5905 100644
--- a/util/draft/enum.h
+++ b/util/draft/enum.h
@@ -27,7 +27,7 @@ const V* FindEnumFromStringImpl(K1 key, const std::pair<K2, V>* entries, size_t
return nullptr;
}
-// special version for const char*
+// special version for const char*
template <class V>
const V* FindEnumFromStringImpl(const char* key, const std::pair<const char*, V>* entries, size_t arraySize) {
for (size_t i = 0; i < arraySize; i++)
@@ -39,28 +39,28 @@ const V* FindEnumFromStringImpl(const char* key, const std::pair<const char*, V>
template <class K, class V>
TString PrintEnumItemsImpl(const std::pair<K, V>* entries, size_t arraySize) {
TString result;
- TStringOutput out(result);
- for (size_t i = 0; i < arraySize; i++)
- out << (i ? ", " : "") << "'" << entries[i].first << "'";
- return result;
-}
-
-// special version for const char*
+ TStringOutput out(result);
+ for (size_t i = 0; i < arraySize; i++)
+ out << (i ? ", " : "") << "'" << entries[i].first << "'";
+ return result;
+}
+
+// special version for const char*
template <class V>
TString PrintEnumItemsImpl(const std::pair<const char*, V>* entries, size_t arraySize) {
TString result;
- TStringOutput out(result);
- for (size_t i = 0; i < arraySize; i++)
+ TStringOutput out(result);
+ for (size_t i = 0; i < arraySize; i++)
out << (i ? ", " : "") << "'" << (entries[i].first ? entries[i].first : "<null>") << "'";
- return result;
-}
-
+ return result;
+}
+
template <class K1, class K2, class V>
const V* EnumFromStringImpl(K1 key, const std::pair<K2, V>* entries, size_t arraySize) {
const V* res = FindEnumFromStringImpl(key, entries, arraySize);
if (res)
return res;
-
+
ythrow TEnumNotFoundException() << "Key '" << key << "' not found in enum. Valid options are: " << PrintEnumItemsImpl(entries, arraySize) << ". ";
}
@@ -69,13 +69,13 @@ const K* EnumToStringImpl(V value, const std::pair<K, V>* entries, size_t arrayS
for (size_t i = 0; i < arraySize; i++)
if (entries[i].second == value)
return &entries[i].first;
-
- TEnumNotFoundException exc;
- exc << "Value '" << int(value) << "' not found in enum. Valid values are: ";
- for (size_t i = 0; i < arraySize; i++)
- exc << (i ? ", " : "") << int(entries[i].second);
- exc << ". ";
- ythrow exc;
+
+ TEnumNotFoundException exc;
+ exc << "Value '" << int(value) << "' not found in enum. Valid values are: ";
+ for (size_t i = 0; i < arraySize; i++)
+ exc << (i ? ", " : "") << int(entries[i].second);
+ exc << ". ";
+ ythrow exc;
}
///////////////////////////////////
diff --git a/util/draft/holder_vector.h b/util/draft/holder_vector.h
index 1c62055bd95..645b2c72fbf 100644
--- a/util/draft/holder_vector.h
+++ b/util/draft/holder_vector.h
@@ -83,7 +83,7 @@ public:
}
using TBase::operator[];
- using TBase::operator bool;
+ using TBase::operator bool;
using TBase::at;
using TBase::back;
using TBase::begin;
diff --git a/util/draft/holder_vector_ut.cpp b/util/draft/holder_vector_ut.cpp
index f64393860af..9e71188536a 100644
--- a/util/draft/holder_vector_ut.cpp
+++ b/util/draft/holder_vector_ut.cpp
@@ -6,13 +6,13 @@ Y_UNIT_TEST_SUITE(THolderVectorTest) {
Y_UNIT_TEST(TestCreateEmpty) {
THolderVector<int> ints;
UNIT_ASSERT_EQUAL(ints.Size(), 0);
- UNIT_ASSERT(!ints);
+ UNIT_ASSERT(!ints);
}
Y_UNIT_TEST(TestCreateNonEmpty) {
THolderVector<int> ints(5);
UNIT_ASSERT_EQUAL(ints.Size(), 5);
- UNIT_ASSERT(ints);
+ UNIT_ASSERT(ints);
for (size_t i = 0; i < ints.Size(); ++i) {
UNIT_ASSERT_EQUAL(ints[i], (int*)nullptr);