Intermediate changes

commit_hash:6768768ea3a3962231d3fabdffb2ce0db44e9347

1 files changed, 12 insertions, 6 deletions

diff --git a/yql/essentials/sql/v1/lexer/regex/regex_ut.cpp b/yql/essentials/sql/v1/lexer/regex/regex_ut.cpp
index 47a94f53ed0..dad0b2ebd2d 100644
--- a/yql/essentials/sql/v1/lexer/regex/regex_ut.cpp
+++ b/yql/essentials/sql/v1/lexer/regex/regex_ut.cpp
@@ -8,12 +8,18 @@ using namespace NSQLTranslationV1;
 
 namespace {
     auto grammar = NSQLReflect::LoadLexerGrammar();
-    auto defaultRegexes = MakeRegexByOtherNameMap(grammar, /* ansi = */ false);
-    auto ansiRegexes = MakeRegexByOtherNameMap(grammar, /* ansi = */ true);
+    auto defaultRegexes = MakeRegexByOtherName(grammar, /* ansi = */ false);
+    auto ansiRegexes = MakeRegexByOtherName(grammar, /* ansi = */ true);
+
+    TString Get(const TVector<std::tuple<TString, TString>>& regexes, const TStringBuf name) {
+        return std::get<1>(*FindIf(regexes, [&](const auto& pair) {
+            return std::get<0>(pair) == name;
+        }));
+    }
 
     void CheckRegex(bool ansi, const TStringBuf name, const TStringBuf expected) {
         const auto& regexes = ansi ? ansiRegexes : defaultRegexes;
-        const TString regex = regexes.at(name);
+        const TString regex = Get(regexes, name);
 
         const RE2 re2(regex);
         Y_ENSURE(re2.ok(), re2.error());
@@ -83,8 +89,8 @@ Y_UNIT_TEST_SUITE(SqlRegexTests) {
     Y_UNIT_TEST(AnsiCommentSameAsDefault) {
         // Because of recursive definition
         UNIT_ASSERT_VALUES_EQUAL(
-            ansiRegexes.at("COMMENT"),
-            defaultRegexes.at("COMMENT"));
+            Get(ansiRegexes, "COMMENT"),
+            Get(defaultRegexes, "COMMENT"));
     }
 
-} // Y_UNIT_TEST_SUITE(SqlRegexTests)
+} // Y_UNIT_TEST_SUITE(SqlRegexTests)
\ No newline at end of file