util  Diff

Differences From Artifact [3480abaab0]:

To Artifact [1d69115b49]:


102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
....
1464
1465
1466
1467
1468
1469
1470

1471
1472
1473
1474
1475
1476
1477
....
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
end
local function mergeD(dest, tbl, ...)
	if tbl == nil then return dest end
	for k,v in pairs(tbl) do dest[k] = v end
	return mergeD(dest, ...)
end
local function merge(...)
	local t = {}
	return mergeD(t, ...)
end
local function copy(t,...)
	return merge(t), copy(...)
end
local function fastDelete(table,idx)
-- delete without preserving table order
	local l = #table
................................................................................
					local obj = pathRef(ctx,m)
					table.insert(obj.rels,newstruct.uid)
				end

				rebuildRelationCache(ctx.dict)
			else -- assemble a list of groups
				local tgtw = ...

				local wp = pathParse(tgtw)
				local o = pathResolve(ctx, wp)

				for i,rs in pairs(ctx.dict.relsets) do
					local allMembers = ctx.dict._relCache[rs.uid].mems
					for j,s in ipairs(allMembers) do
						if pathSub(s.path, wp) then
................................................................................
							end
						end
						local kls = {
							syn = fo.color('synonyms',2,true)..' of';
							ant = fo.color('antonyms',1,true)..' of';
							met = fo.color('metonyms',4,true)..' of';
						}
						io.stdout:write(string.format("% 4u) %s\n%s", i, fo.ul(kls[g.set.kind] .. ' ' .. llab), table.concat(others,'\n')) .. '\n')
					end
					return false -- no changes made
				elseif op == 'link' or op == 'drop' then
					local tgtn, paths = (select(2,...)), { select(3, ...) }
					rebuildRelationCache(ctx.dict)
				elseif op == 'destroy' then
					local tgtw, tgtn = ...







<
|







 







>







 







|







102
103
104
105
106
107
108

109
110
111
112
113
114
115
116
....
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
....
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
end
local function mergeD(dest, tbl, ...)
	if tbl == nil then return dest end
	for k,v in pairs(tbl) do dest[k] = v end
	return mergeD(dest, ...)
end
local function merge(...)

	return mergeD({}, ...)
end
local function copy(t,...)
	return merge(t), copy(...)
end
local function fastDelete(table,idx)
-- delete without preserving table order
	local l = #table
................................................................................
					local obj = pathRef(ctx,m)
					table.insert(obj.rels,newstruct.uid)
				end

				rebuildRelationCache(ctx.dict)
			else -- assemble a list of groups
				local tgtw = ...
				if tgtw == nil then id10t 'missing path' end
				local wp = pathParse(tgtw)
				local o = pathResolve(ctx, wp)

				for i,rs in pairs(ctx.dict.relsets) do
					local allMembers = ctx.dict._relCache[rs.uid].mems
					for j,s in ipairs(allMembers) do
						if pathSub(s.path, wp) then
................................................................................
							end
						end
						local kls = {
							syn = fo.color('synonyms',2,true)..' of';
							ant = fo.color('antonyms',1,true)..' of';
							met = fo.color('metonyms',4,true)..' of';
						}
						io.stdout:write(string.format("% 4d) %s\n%s", i, fo.ul(kls[g.set.kind] .. ' ' .. llab), table.concat(others,'\n')) .. '\n')
					end
					return false -- no changes made
				elseif op == 'link' or op == 'drop' then
					local tgtn, paths = (select(2,...)), { select(3, ...) }
					rebuildRelationCache(ctx.dict)
				elseif op == 'destroy' then
					local tgtw, tgtn = ...