Skip to content

Fix source range offsets for lists, maps and messages. #1726

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+26 −3
Open

Fix source range offsets for lists, maps and messages. #1726

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
6 changes: 3 additions & 3 deletions parser/parser.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1089,7 +1089,7 @@ std::any ParserVisitor::visitCreateMessage(
} else {
name = absl::StrJoin(parts, ".");
}
int64_t obj_id = factory_.NextId(SourceRangeFromToken(ctx->op));
int64_t obj_id = factory_.NextId(SourceRangeFromParserRuleContext(ctx));
std::vector<StructExprField> fields;
if (ctx->entries) {
fields = visitFields(ctx->entries);
Expand Down Expand Up @@ -1191,7 +1191,7 @@ std::any ParserVisitor::visitNested(CelParser::NestedContext* ctx) {
}

std::any ParserVisitor::visitCreateList(CelParser::CreateListContext* ctx) {
int64_t list_id = factory_.NextId(SourceRangeFromToken(ctx->op));
int64_t list_id = factory_.NextId(SourceRangeFromParserRuleContext(ctx));
auto elems = visitList(ctx->elems);
return ExprToAny(factory_.NewList(list_id, std::move(elems)));
}
Expand Down Expand Up @@ -1229,7 +1229,7 @@ std::vector<Expr> ParserVisitor::visitList(CelParser::ExprListContext* ctx) {
}

std::any ParserVisitor::visitCreateMap(CelParser::CreateMapContext* ctx) {
int64_t struct_id = factory_.NextId(SourceRangeFromToken(ctx->op));
int64_t struct_id = factory_.NextId(SourceRangeFromParserRuleContext(ctx));
std::vector<MapExprEntry> entries;
if (ctx->entries) {
entries = visitEntries(ctx->entries);
Expand Down
23 changes: 23 additions & 0 deletions parser/parser_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1519,6 +1519,29 @@ TEST_P(ExpressionTest, Parse) {
}
}

TEST(ExpressionTest, CompositeExpressionOffsets) {
ParserOptions options;
std::vector<Macro> macros = Macro::AllMacros();

std::string list_expr = "[1, 2]";
auto list_result = EnrichedParse(list_expr, macros, "<input>", options);
ASSERT_THAT(list_result, IsOk());
auto list_offsets = list_result->enriched_source_info().offsets();
EXPECT_EQ(list_offsets.at(1), std::make_pair(0, 5));

std::string map_expr = "{'a': 1}";
auto map_result = EnrichedParse(map_expr, macros, "<input>", options);
ASSERT_THAT(map_result, IsOk());
auto map_offsets = map_result->enriched_source_info().offsets();
EXPECT_EQ(map_offsets.at(1), std::make_pair(0, 7));

std::string msg_expr = "Msg{f: 1}";
auto msg_result = EnrichedParse(msg_expr, macros, "<input>", options);
ASSERT_THAT(msg_result, IsOk());
auto msg_offsets = msg_result->enriched_source_info().offsets();
EXPECT_EQ(msg_offsets.at(1), std::make_pair(0, 8));
}

TEST(ExpressionTest, TsanOom) {
Parse(
"[[a([[???[a[[??[a([[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[["
Expand Down