fly/fgdata
1
0
Fork 0
Code Activity

props.nas prevent endless recursion in copy if destination is a subnode of source

Browse source
This commit is contained in:
Henning Stahlke 2020-04-22 17:29:14 +02:00 • committed by James Turner
parent eeb1b5e3d5
commit 627530cf5b
1 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Nasal/props.nas
View file

@ -209,9 +209,27 @@ var dump = func {
# if optional third argument is set and non-zero. # if optional third argument is set and non-zero.
# #
var copy = func(src, dest, attr = 0) { var copy = func(src, dest, attr = 0) {
var sp = src.getPath() or "";
var dp = dest.getPath() or "";
# sp and dp may be equal but on different trees!
# check if dest is sub node of source
sp = split("/", sp);
dp = split("/", dp);
while (size(sp) and size(dp) and (sp[0] == dp[0])) {
sp = subvec(sp, 1);
dp = subvec(dp, 1);
}
foreach(var c; src.getChildren()) { foreach(var c; src.getChildren()) {
var name = c.getName() ~ "[" ~ c.getIndex() ~ "]"; var name = c.getName();
copy(src.getNode(name), dest.getNode(name, 1), attr); var i = c.getIndex();
if (i) name ~= "["~i~"]";
if (!(!size(sp) and size(dp) and name == dp[0]))
copy(src.getNode(name), dest.getNode(name, 1), attr);
else {
logprint(DEV_WARN, "props.copy() skipping "~name~" (recursion!)");
}
} }
var type = src.getType(); var type = src.getType();
var val = src.getValue(); var val = src.getValue();