diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-09-16 17:39:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-16 17:39:43 +0200 |
| commit | 6ac7b90097bceaaaad7fef3c5eb6eb705929f640 (patch) | |
| tree | 86c91ae610de5d766503145cf0c413240b36b00c /core | |
| parent | 17772112715f20b079b8d0bb25f2472e65ec2cde (diff) | |
| parent | 4e6b5169b072bb160ba355f59bae02915426abb6 (diff) | |
Merge pull request #42013 from Xrayez/fix-list-swap
Fix `List` swap behavior on front, back and adjacent elements
Diffstat (limited to 'core')
| -rw-r--r-- | core/list.h | 40 |
1 files changed, 25 insertions, 15 deletions
diff --git a/core/list.h b/core/list.h index f850db5241..1cef3c484d 100644 --- a/core/list.h +++ b/core/list.h @@ -395,28 +395,38 @@ public: ERR_FAIL_COND(p_A->data != _data); ERR_FAIL_COND(p_B->data != _data); + if (p_A == p_B) { + return; + } Element *A_prev = p_A->prev_ptr; Element *A_next = p_A->next_ptr; + Element *B_prev = p_B->prev_ptr; + Element *B_next = p_B->next_ptr; - p_A->next_ptr = p_B->next_ptr; - p_A->prev_ptr = p_B->prev_ptr; - - p_B->next_ptr = A_next; - p_B->prev_ptr = A_prev; - - if (p_A->prev_ptr) { - p_A->prev_ptr->next_ptr = p_A; + if (A_prev) { + A_prev->next_ptr = p_B; + } else { + _data->first = p_B; } - if (p_A->next_ptr) { - p_A->next_ptr->prev_ptr = p_A; + if (B_prev) { + B_prev->next_ptr = p_A; + } else { + _data->first = p_A; } - - if (p_B->prev_ptr) { - p_B->prev_ptr->next_ptr = p_B; + if (A_next) { + A_next->prev_ptr = p_B; + } else { + _data->last = p_B; } - if (p_B->next_ptr) { - p_B->next_ptr->prev_ptr = p_B; + if (B_next) { + B_next->prev_ptr = p_A; + } else { + _data->last = p_A; } + p_A->prev_ptr = A_next == p_B ? p_B : B_prev; + p_A->next_ptr = B_next == p_A ? p_B : B_next; + p_B->prev_ptr = B_next == p_A ? p_A : A_prev; + p_B->next_ptr = A_next == p_B ? p_A : A_next; } /** * copy the list |