vishapoberon/vipak
1
0
Fork 0
mirror of https://github.com/vishapoberon/vipak.git synced 2026-04-06 04:52:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

now the resolver client should install the retriever procedure.

Browse source
This commit is contained in:
Norayr Chilingarian 2020-06-14 21:51:26 +04:00
parent db0a32e674
commit f6a4c1f0bc
4 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/vpkResolver.Mod
View file

@ -1,5 +1,5 @@
MODULE vpkResolver;
IMPORT Out, StringList, vpkdepTree, vpkJsonDepRetriever;
IMPORT Out, StringList, vpkdepTree;
TYPE
Tdep = vpkdepTree.Tdep;
@ -7,6 +7,8 @@ TYPE
TdepTree = vpkdepTree.TdepTree;
VAR rtvr: vpkdepTree.retriever;
PROCEDURE treeContains(VAR d: Tdep; VAR depTree: TdepTree): BOOLEAN;
VAR
res: BOOLEAN;
@ -46,7 +48,7 @@ BEGIN
t := met.GetByName(met, e.obj(StringList.TString).str^);
IF t = NIL THEN
t := vpkdepTree.CreateDep(e.obj(StringList.TString).str^);
t.InstallRetriever(t, vpkJsonDepRetriever.getDeps);
t.InstallRetriever(t, rtvr);
END;
deps[i] := t;
IF ~treeContains(t, depTree) THEN
@ -67,16 +69,17 @@ BEGIN
depTree.Add(depTree, d);
END mkDepTree;
PROCEDURE resolve*(first: ARRAY OF CHAR): TdepTree;
PROCEDURE resolve*(first: ARRAY OF CHAR; r: vpkdepTree.retriever): TdepTree;
VAR
depTree: TdepTree;
met: TdepTree;
dep: Tdep;
BEGIN
rtvr := r;
depTree := vpkdepTree.Create();
met := vpkdepTree.Create(); (* for deps that we already met *)
dep := vpkdepTree.CreateDep(first);
dep.InstallRetriever(dep, vpkJsonDepRetriever.getDeps);
dep.InstallRetriever(dep, rtvr);
mkDepTree(dep, depTree, met);
RETURN depTree
END resolve;