Intermediate changes

commit_hash:6768768ea3a3962231d3fabdffb2ce0db44e9347

Author: robot-piglet

yql/essentials/parser/common/ya.make

@@ -9,3 +9,7 @@ SRCS(
 )
 
 END()
+
+RECURSE(
+    antlr4
+)

yql/essentials/sql/v1/complete/name/ya.make

@@ -1,3 +1,8 @@
 LIBRARY()
 
 END()
+
+RECURSE(
+    fallback
+    static
+)

yql/essentials/sql/v1/complete/ya.make

@@ -20,6 +20,13 @@ PEERDIR(
 
 END()
 
+RECURSE(
+    antlr4
+    name
+    syntax
+    text
+)
+
 RECURSE_FOR_TESTS(
     ut
 )

yql/essentials/sql/v1/lexer/regex/lexer_ut.cpp

@@ -197,10 +197,10 @@ Y_UNIT_TEST_SUITE(RegexLexerTests) {
 
         TString expected =
             "SELECT WS(\n) "
-            "WS( ) WS( ) INTEGER_VALUE(123467) COMMA(,) WS(\n) "
+            "WS( ) WS( ) DIGITS(123467) COMMA(,) WS(\n) "
             "WS( ) WS( ) STRING_VALUE(\"Hello, {name}!\") COMMA(,) WS(\n) "
-            "WS( ) WS( ) LPAREN(() INTEGER_VALUE(1) WS( ) PLUS(+) WS( ) LPAREN(() INTEGER_VALUE(5) WS( ) "
-            "ASTERISK(*) WS( ) INTEGER_VALUE(1) WS( ) SLASH(/) WS( ) INTEGER_VALUE(0) RPAREN()) "
+            "WS( ) WS( ) LPAREN(() DIGITS(1) WS( ) PLUS(+) WS( ) LPAREN(() DIGITS(5) WS( ) "
+            "ASTERISK(*) WS( ) DIGITS(1) WS( ) SLASH(/) WS( ) DIGITS(0) RPAREN()) "
             "RPAREN()) COMMA(,) WS(\n) "
             "WS( ) WS( ) ID_PLAIN(MIN) LPAREN(() ID_PLAIN(identifier) RPAREN()) COMMA(,) WS(\n) "
             "WS( ) WS( ) ID_PLAIN(Bool) LPAREN(() ID_PLAIN(field) RPAREN()) COMMA(,) WS(\n) "
@@ -216,4 +216,4 @@ Y_UNIT_TEST_SUITE(RegexLexerTests) {
         Check("\" SELECT", "[INVALID] WS( ) SELECT EOF");
     }
 
-} // Y_UNIT_TEST_SUITE(RegexLexerTests)
+} // Y_UNIT_TEST_SUITE(RegexLexerTests)

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)

yql/essentials/sql/v1/lexer/regex/ut/ya.make

@@ -10,4 +10,4 @@ SRCS(
     regex_ut.cpp
 )
 
-END()
+END()

yql/essentials/sql/v1/lexer/ya.make

@@ -22,6 +22,7 @@ RECURSE(
     antlr4_ansi
     antlr4_pure
     antlr4_pure_ansi
+    regex
 )
 
 RECURSE_FOR_TESTS(

yql/essentials/sql/v1/reflect/sql_reflect_ut.cpp

@@ -28,9 +28,9 @@ Y_UNIT_TEST_SUITE(SqlReflectTests) {
     }
 
     Y_UNIT_TEST(Other) {
-        UNIT_ASSERT_VALUES_EQUAL(grammar.OtherNames.contains("REAL"), true);
-        UNIT_ASSERT_VALUES_EQUAL(grammar.OtherNames.contains("STRING_VALUE"), true);
-        UNIT_ASSERT_VALUES_EQUAL(grammar.OtherNames.contains("STRING_MULTILINE"), false);
+        UNIT_ASSERT_VALUES_EQUAL(Count(grammar.OtherNames, "REAL"), 1);
+        UNIT_ASSERT_VALUES_EQUAL(Count(grammar.OtherNames, "STRING_VALUE"), 1);
+        UNIT_ASSERT_VALUES_EQUAL(Count(grammar.OtherNames, "STRING_MULTILINE"), 0);
 
         UNIT_ASSERT_VALUES_EQUAL(
             grammar.BlockByName.at("FLOAT_EXP"),

yql/essentials/sql/v1/ya.make

@@ -61,6 +61,7 @@ RECURSE(
     lexer
     perf
     proto_parser
+    reflect
 )
 
 RECURSE_FOR_TESTS(