Skip to content

fix(core): fix iterator in backspace handling #️⃣ #15596

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
ermshiperete wants to merge 2 commits into
base: master
Choose a base branch
from
+29 −30
Open

fix(core): fix iterator in backspace handling #️⃣ #15596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32bb1c8
fix(core): fix iterator in backspace handling
ermshiperete Feb 17, 2026
df2b675
fix(core): changed ldml tests to use context list instead of vector
ermshiperete Feb 18, 2026
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
8 changes: 4 additions & 4 deletions core/src/ldml/ldml_processor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,15 +233,15 @@ void ldml_event_state::emit_backspace() {
// Find out what the last actual character was and remove it.
// attempt to get the last char
// TODO-LDML: emoji backspace
auto end = state->context().rbegin();
while (end != state->context().rend()) {
if (end->type == KM_CORE_CT_CHAR) {
while (!state->context().empty()) {
auto end = state->context().back();
if (end.type == KM_CORE_CT_CHAR) {
actions.code_points_to_delete++;
state->context().pop_back();
return;
}
// else loop again
assert(end->type != KM_CORE_CT_END); // inappropriate here.
assert(end.type != KM_CORE_CT_END); // inappropriate here.
state->context().pop_back();
}
/*
Expand Down
51 changes: 25 additions & 26 deletions core/tests/unit/ldml/ldml.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

namespace {

void print_context(std::u16string &text_store, km_core_state *&test_state, std::vector<km_core_context_item> &test_context);
void print_context(std::u16string &text_store, km_core_state *&test_state, std::list<km_core_context_item> &test_context);

bool g_beep_found = false;

Expand Down Expand Up @@ -68,10 +68,10 @@ string_to_hex(const std::u16string &input) {


void
copy_context_items_to_vector(km_core_context_item *citems, std::vector<km_core_context_item> &vector) {
vector.clear();
copy_context_items_to_list(km_core_context_item *citems, std::list<km_core_context_item> &list) {
list.clear();
for(km_core_context_item *ci = citems; ci->type != KM_CORE_CT_END; ci++) {
vector.emplace_back(*ci);
list.emplace_back(*ci);
}
}

Expand All @@ -81,9 +81,9 @@ apply_action(
km_core_state *test_state,
km_core_action_item const &act,
std::u16string &text_store,
std::vector<km_core_context_item> &context,
std::list<km_core_context_item> &context,
km::tests::LdmlTestSource &test_source,
std::vector<km_core_context_item> &test_context) {
std::list<km_core_context_item> &test_context) {

// print_context(text_store, test_state, test_context);
switch (act.type) {
Expand Down Expand Up @@ -157,21 +157,20 @@ apply_action(
matched_text = true; // no text to match as context is empty.
}
// now, we need to simulate what ldml_processor::emit_backspace() is going to do.
auto end = context.rbegin();
while (end != context.rend()) {
if (end->type == KM_CORE_CT_CHAR) {
test_assert(!matched_text);
test_assert_equal(end->character, ch); // expect popped char to be same as what's in context
matched_text = true;
context.pop_back();
break; // exit on first real char
}
test_assert(end->type != KM_CORE_CT_END); // inappropriate here.
while (!context.empty()) {
if (context.back().type == KM_CORE_CT_CHAR) {
test_assert(!matched_text);
test_assert_equal(context.back().character, ch); // expect popped char to be same as what's in context
matched_text = true;
context.pop_back();
break; // exit on first real char
}
test_assert(matched_text);
test_assert(context.back().type != KM_CORE_CT_END); // inappropriate here.
context.pop_back();
}
test_assert(matched_text);
break;
}
case KM_CORE_IT_PERSIST_OPT:
std::cout << " + TODO-LDML: persist_opt()" << std::endl;
break;
Expand All @@ -184,9 +183,9 @@ apply_action(
// We replace the cached context with the current application context
km_core_status status = context_items_from_utf16(text_store.c_str(), &new_context_items);
test_assert(status == KM_CORE_STATUS_OK);
copy_context_items_to_vector(new_context_items, context);
copy_context_items_to_list(new_context_items, context);
// also update the test context
copy_context_items_to_vector(new_context_items, test_context);
copy_context_items_to_list(new_context_items, test_context);
// TODO-LDML: now we need to SET the core context!
status = km_core_context_set(km_core_state_context(test_state), new_context_items);
km_core_context_items_dispose(new_context_items);
Expand All @@ -212,9 +211,9 @@ apply_actions(
km_core_state *test_state,
km_core_actions const *actions,
std::u16string &text_store,
std::vector<km_core_context_item> &context,
std::list<km_core_context_item> &context,
km::tests::LdmlTestSource &test_source,
std::vector<km_core_context_item> &test_context
std::list<km_core_context_item> &test_context
) {

if(actions->do_alert) {
Expand Down Expand Up @@ -245,7 +244,7 @@ apply_actions(
}

void
print_context(std::u16string &text_store, km_core_state *&test_state, std::vector<km_core_context_item> &test_context) {
print_context(std::u16string &text_store, km_core_state *&test_state, std::list<km_core_context_item> &test_context) {
// Compare context and text store at each step - should be identical
size_t n = 0;
km_core_context_item *citems = nullptr;
Expand Down Expand Up @@ -280,7 +279,7 @@ print_context(std::u16string &text_store, km_core_state *&test_state, std::vecto

std::cout << "test_context : ";
std::cout.fill('0');
for (auto i = test_context.begin(); i < test_context.end(); i++) {
for (auto i = test_context.begin(); i != test_context.end(); i++) {
switch (i->type) {
case KM_CORE_CT_CHAR:
std::cout << "U+" << std::setw(4) << std::hex << i->character << std::dec << " ";
Expand All @@ -302,7 +301,7 @@ print_context(std::u16string &text_store, km_core_state *&test_state, std::vecto
* verify the current context
*/
void
verify_context(std::u16string &text_store, km_core_state *&test_state, std::vector<km_core_context_item> &test_context, bool fully_normalized_mode, bool normalization_enabled) {
verify_context(std::u16string &text_store, km_core_state *&test_state, std::list<km_core_context_item> &test_context, bool fully_normalized_mode, bool normalization_enabled) {
// Compare context and text store at each step - should be identical
print_context(text_store, test_state, test_context);

Expand Down Expand Up @@ -435,7 +434,7 @@ run_test(const km::core::path &source, const km::core::path &compiled, km::tests

g_beep_found = false;

std::vector<km_core_context_item> test_context;
std::list<km_core_context_item> test_context;

km_core_context_item *citems = nullptr;
// setup test_context
Expand All @@ -448,7 +447,7 @@ run_test(const km::core::path &source, const km::core::path &compiled, km::tests
}

// Make a copy of the setup context for the test
copy_context_items_to_vector(citems, test_context);
copy_context_items_to_list(citems, test_context);
km_core_context_items_dispose(citems);

// Setup baseline text store
Expand Down