Skip to content

change lexer to antlr4 one #26787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 14, 2025
+9 −9
Merged

change lexer to antlr4 one #26787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ydb/core/sys_view/show_create/create_view_formatter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <ydb/public/lib/ydb_cli/dump/util/query_utils.h>

#include <yql/essentials/parser/proto_ast/gen/v1/SQLv1Lexer.h>
#include <yql/essentials/parser/proto_ast/gen/v1_antlr4/SQLv1Antlr4Lexer.h>
#include <yql/essentials/sql/settings/translation_settings.h>
#include <yql/essentials/sql/v1/lexer/antlr4/lexer.h>
#include <yql/essentials/sql/v1/lexer/antlr4_ansi/lexer.h>
Expand Down Expand Up @@ -62,7 +62,7 @@ struct TTokenCollector {
void operator()(const NProtoBuf::Message& message) const {
if (const auto* token = dynamic_cast<const TToken*>(&message)) {
const auto& value = token->GetValue();
if (token->GetId() != NALPDefault::SQLv1LexerTokens::TOKEN_EOF) {
if (token->GetValue() != "<EOF>") {
if (!Tokens.empty()) {
Tokens << ' ';
}
Expand Down
6 changes: 3 additions & 3 deletions ydb/public/lib/ydb_cli/dump/util/query_utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "query_utils.h"

#include <yql/essentials/parser/proto_ast/gen/v1/SQLv1Lexer.h>
#include <yql/essentials/parser/proto_ast/gen/v1_proto_split/SQLv1Parser.pb.main.h>
#include <yql/essentials/parser/proto_ast/gen/v1_antlr4/SQLv1Antlr4Lexer.h>
#include <yql/essentials/parser/proto_ast/gen/v1_proto_split_antlr4/SQLv1Antlr4Parser.pb.main.h>
#include <yql/essentials/sql/settings/translation_settings.h>
#include <yql/essentials/sql/v1/format/sql_format.h>
#include <yql/essentials/sql/v1/proto_parser/proto_parser.h>
Expand Down Expand Up @@ -147,7 +147,7 @@ struct TTokenCollector {
void operator()(const NProtoBuf::Message& message) {
if (const auto* token = dynamic_cast<const TToken*>(&message)) {
const auto& value = token->GetValue();
if (token->GetId() != NALPDefault::SQLv1LexerTokens::TOKEN_EOF) {
if (token->GetValue() != "<EOF>") {
if (!Tokens.empty()) {
Tokens << ' ';
}
Expand Down
4 changes: 2 additions & 2 deletions ydb/public/lib/ydb_cli/dump/util/view_utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include "query_utils.h"
#include "view_utils.h"

#include <yql/essentials/parser/proto_ast/gen/v1/SQLv1Lexer.h>
#include <yql/essentials/parser/proto_ast/gen/v1_proto_split/SQLv1Parser.pb.main.h>
#include <yql/essentials/parser/proto_ast/gen/v1_antlr4/SQLv1Antlr4Lexer.h>
#include <yql/essentials/parser/proto_ast/gen/v1_proto_split_antlr4/SQLv1Antlr4Parser.pb.main.h>
#include <yql/essentials/public/issue/yql_issue.h>

#include <util/string/builder.h>
Expand Down
4 changes: 2 additions & 2 deletions ydb/public/lib/ydb_cli/dump/util/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ PEERDIR(
ydb/public/sdk/cpp/src/client/scheme
ydb/public/sdk/cpp/src/client/table
ydb/public/sdk/cpp/src/client/types/status
yql/essentials/parser/proto_ast/gen/v1
yql/essentials/parser/proto_ast/gen/v1_proto_split
yql/essentials/parser/proto_ast/gen/v1_antlr4
yql/essentials/parser/proto_ast/gen/v1_proto_split_antlr4
yql/essentials/sql/settings
yql/essentials/sql/v1/format
yql/essentials/sql/v1/proto_parser
Expand Down
Loading