UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-21 23:00:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

[poincare] Copy static nodes in the pool before add/replaceChild

Browse Source
This commit is contained in:
Léa Saviot
2018-08-17 10:34:42 +02:00
parent cdd2f731f7
commit 4269003d1a
1 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
poincare/src/tree_by_reference.cpp
View File

@@ -46,6 +46,9 @@ void TreeByReference::replaceWithInPlace(TreeByReference t) {
}
void TreeByReference::replaceChildInPlace(TreeByReference oldChild, TreeByReference newChild) {
assert(!oldChild.isUninitialized());
assert(!newChild.isUninitialized());
if (oldChild == newChild) {
return;
}
@@ -59,6 +62,17 @@ void TreeByReference::replaceChildInPlace(TreeByReference oldChild, TreeByRefere
return;
}
// If the new node is static, copy it in the pool and add the copy
if (newChild.isStatic()) {
TreeByReference newT = TreeByReference(TreePool::sharedPool()->deepCopy(newChild.node()));
if (newT.isAllocationFailure()) {
replaceWithAllocationFailureInPlace(numberOfChildren());
return;
}
replaceChildInPlace(oldChild, newT);
return;
}
// Move the new child
assert(newChild.parent().isUninitialized());
TreePool::sharedPool()->move(oldChild.node(), newChild.node(), newChild.numberOfChildren());
@@ -166,7 +180,9 @@ void TreeByReference::log() const {
// Add
void TreeByReference::addChildAtIndexInPlace(TreeByReference t, int index, int currentNumberOfChildren) {
assert(!isUninitialized());
if (node()->isAllocationFailure()) {
assert(!t.isUninitialized());
if (isAllocationFailure()) {
return;
}
if (t.isAllocationFailure()) {
@@ -174,8 +190,19 @@ void TreeByReference::addChildAtIndexInPlace(TreeByReference t, int index, int c
return;
}
assert(index >= 0 && index <= currentNumberOfChildren);
assert(t.parent().isUninitialized());
// If the new node is static, copy it in the pool and add the copy
if (t.isStatic()) {
TreeByReference newT = TreeByReference(TreePool::sharedPool()->deepCopy(t.node()));
if (newT.isAllocationFailure()) {
replaceWithAllocationFailureInPlace(currentNumberOfChildren);
return;
}
addChildAtIndexInPlace(newT, index, currentNumberOfChildren);
return;
}
// Move t
TreeNode * newChildPosition = node()->next();
for (int i = 0; i < index; i++) {