From 4aff0f44e1bc51943f0ac3c11489238e3abbcbc4 Mon Sep 17 00:00:00 2001 From: Norayr Chilingarian Date: Wed, 17 Jun 2020 18:24:17 +0400 Subject: [PATCH] simplification of resolver via new StringList.GetString method. --- lists | 2 +- src/vpkResolver.Mod | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lists b/lists index 8bd4367..9235743 160000 --- a/lists +++ b/lists @@ -1 +1 @@ -Subproject commit 8bd436755e98807041cd19e9356c7cedb25dd5e9 +Subproject commit 9235743df082eeb719f583f5261c792df9feec99 diff --git a/src/vpkResolver.Mod b/src/vpkResolver.Mod index d0780e8..900322f 100644 --- a/src/vpkResolver.Mod +++ b/src/vpkResolver.Mod @@ -2,6 +2,7 @@ MODULE vpkResolver; IMPORT Out, StringList, vpkdepTree; TYPE + pstr = StringList.pstring; Tdep = vpkdepTree.Tdep; Tdeps = vpkdepTree.Tdeps; @@ -33,7 +34,7 @@ VAR depStrs: StringList.TStringList; t: Tdep; deps: Tdeps; - e: StringList.Node; + p: pstr; i: INTEGER; BEGIN met.Add(met, d); @@ -43,11 +44,11 @@ BEGIN NEW (deps, depStrs.Count); i := 0; REPEAT - e := depStrs.Get(depStrs, i); - IF e # NIL THEN - t := met.GetByName(met, e.obj(StringList.TString).str^); + p := depStrs.GetString(depStrs, i); + IF p # NIL THEN + t := met.GetByName(met, p^); IF t = NIL THEN - t := vpkdepTree.CreateDep(e.obj(StringList.TString).str^); + t := vpkdepTree.CreateDep(p^); t.InstallRetriever(t, rtvr); END; deps[i] := t;