interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

And integrated the cycle-checking code. Woo it's got tests! Now we need to worry about the OS-side test code, assuming I don't have any more pesky TODOs to fix immediately...

This commit is contained in:
Pietro Gagliardi 2020-05-11 21:02:04 -04:00
parent b1d733e9a2
commit 19a776e446
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/controls.c
View File

@ -237,6 +237,10 @@ void uiControlSetParent(uiControl *c, uiControl *parent)
uiprivProgrammerErrorReparenting("a", "another", uiprivFunc); uiprivProgrammerErrorReparenting("a", "another", uiprivFunc);
return; return;
} }
if (parentHasCycle(c, parent)) {
uiprivProgrammerErrorControlParentCycle(uiprivFunc);
return;
}
c->parent = parent; c->parent = parent;
} }

3
common/programmererrors.h
View File

@ -75,4 +75,7 @@
uiprivProgrammerError("%s(): cannot set a control with %s parent to have %s parent", \ uiprivProgrammerError("%s(): cannot set a control with %s parent to have %s parent", \
func, current, next) func, current, next)
#define uiprivProgrammerErrorControlParentCycle(func) \
uiprivProgrammerError("%s(): cannot create a parent cycle", func)
// } // }

6
test/controls.c
View File

@ -435,7 +435,7 @@ Test(ControlParentCyclesDisallowed_TwoControls)
d = uiNewControl(testControlType(), NULL); d = uiNewControl(testControlType(), NULL);
uiControlSetParent(c, d); uiControlSetParent(c, d);
ctx = beginCheckProgrammerError("TODO"); ctx = beginCheckProgrammerError("uiControlSetParent(): cannot create a parent cycle");
uiControlSetParent(d, c); uiControlSetParent(d, c);
endCheckProgrammerError(ctx); endCheckProgrammerError(ctx);
@ -457,7 +457,7 @@ Test(ControlParentCyclesDisallowed_ThreeControls)
uiControlSetParent(c, d); uiControlSetParent(c, d);
uiControlSetParent(d, e); uiControlSetParent(d, e);
ctx = beginCheckProgrammerError("TODO"); ctx = beginCheckProgrammerError("uiControlSetParent(): cannot create a parent cycle");
uiControlSetParent(e, c); uiControlSetParent(e, c);
endCheckProgrammerError(ctx); endCheckProgrammerError(ctx);
@ -475,7 +475,7 @@ Test(ControlCannotBeItsOwnParent)
void *ctx; void *ctx;
c = uiNewControl(testControlType(), NULL); c = uiNewControl(testControlType(), NULL);
ctx = beginCheckProgrammerError("TODO"); ctx = beginCheckProgrammerError("uiControlSetParent(): cannot create a parent cycle");
uiControlSetParent(c, c); uiControlSetParent(c, c);
endCheckProgrammerError(ctx); endCheckProgrammerError(ctx);
uiControlFree(c); uiControlFree(c);