lisyarus/psemek
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix tagged text escaping & tests

Browse source
This commit is contained in:
Nikita Lisitsa 2022-05-21 22:02:03 +03:00
parent 183f5283e2
commit 2b228fbd32
2 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
libs/ui/source/tagged_text.cpp
View file

@ -56,19 +56,10 @@ namespace psemek::ui
}
else
{
auto start = current;
if (*current == '\\')
{
++current;
if (current == text.end())
error("unexpected end");
}
auto append = [&](std::string_view & target)
{
if (target.empty())
target = {start, current + 1};
target = {current, current + 1};
else
target = {target.data(), current + 1};
};
@ -87,9 +78,23 @@ namespace psemek::ui
}
else
{
if (result.tokens.empty() || !std::get_if<std::string_view>(&result.tokens.back()))
result.tokens.push_back(std::string_view{});
append(std::get<std::string_view>(result.tokens.back()));
if (*current == '\\')
{
++current;
if (current < text.end())
{
result.tokens.push_back(std::string_view{});
append(std::get<std::string_view>(result.tokens.back()));
}
else
--current;
}
else
{
if (result.tokens.empty() || !std::get_if<std::string_view>(&result.tokens.back()))
result.tokens.push_back(std::string_view{});
append(std::get<std::string_view>(result.tokens.back()));
}
}
}

9
libs/ui/tests/tagged_text.cpp
View file

@ -93,10 +93,11 @@ test_case(ui_tagged__text_tag__attribute)
test_case(ui_tagged__text_escape)
{
test("\\[", {{"\\["}});
test("\\]", {{"\\]"}});
test("\\\\", {{"\\\\"}});
test("\\[\\]", {{"\\[\\]"}});
test("\\[", {{"["}});
test("\\]", {{"]"}});
test("\\\\", {{"\\"}});
test("\\[\\]", {{"[", "]"}});
test(R"(text \[not \\ tag\] end)", {{"text ", "[not ", "\\ tag", "] end"}});
}
test_case(ui_tagged__text_error)