mirror of
https://github.com/vishapoberon/vipak.git
synced 2026-04-06 04:52:26 +00:00
refactoring to use sts-q's json module. compiles.
This commit is contained in:
Norayr Chilingarian
parent
f303281641
commit
bf32bf4a8f
6 changed files with 316 additions and 87 deletions
|
|
@ -1,33 +1,75 @@
|
|||
MODULE vpkJsonDepRetriever;
|
||||
IMPORT Out, StringList, strUtils, vpkJsonParser, vpkStorage, vpkSettings, vpkdepTree;
|
||||
IMPORT Strings, Out,
|
||||
StringList, strUtils, Json, vpkStorage, vpkSettings, vpkdepTree;
|
||||
|
||||
CONST
|
||||
ErrmessSize = 4096;
|
||||
|
||||
PROCEDURE getBuildInfo*(VAR d: vpkdepTree.Tdep; VAR k, v: StringList.TStringList): BOOLEAN;
|
||||
VAR
|
||||
p: strUtils.pstring;
|
||||
jsonRecord, build : vpkJsonParser.JsonTypePointer;
|
||||
keys, values: StringList.TStringList;
|
||||
jsonstr, errstr: strUtils.pstring;
|
||||
tree, buildValue, command, file: Json.Value;
|
||||
rootObj, buildStep: Json.Obj;
|
||||
buildArray: Json.Arr;
|
||||
cm, fl, bl: Json.jString;
|
||||
b: BOOLEAN;
|
||||
BEGIN
|
||||
b := FALSE;
|
||||
p := NIL;
|
||||
vpkStorage.json2pstring(d.name^, p);
|
||||
IF p # NIL THEN
|
||||
jsonRecord := vpkJsonParser.Create(p^);
|
||||
build := jsonRecord.GetNonTerminal(jsonRecord, vpkSettings.bldType);
|
||||
IF build # NIL THEN
|
||||
keys := NIL; values := NIL;
|
||||
jsonstr := NIL;
|
||||
vpkStorage.json2pstring(d.name^, jsonstr);
|
||||
IF jsonstr # NIL THEN
|
||||
NEW(errstr, ErrmessSize);
|
||||
b := Json.Parse(tree, jsonstr^, errstr^);
|
||||
(*build := jsonRecord.GetNonTerminal(jsonRecord, vpkSettings.bldType);*)
|
||||
IF b THEN
|
||||
(*keys := NIL; values := NIL;
|
||||
build.GetTerminalKeys(build, keys);
|
||||
build.GetTerminalValues(build, values);
|
||||
k := keys; v := values;
|
||||
RETURN TRUE
|
||||
k := keys; v := values;*)
|
||||
IF tree IS Json.Obj THEN
|
||||
rootObj := tree(Json.Obj);
|
||||
NEW(bl, Strings.Length(vpkSettings.bldType)+1); (* +1 for 0X *)
|
||||
COPY(vpkSettings.bldType, bl^);
|
||||
IF Json.ObjSelect(buildValue, rootObj, bl) THEN
|
||||
IF buildValue IS Json.Arr THEN
|
||||
buildArray := buildValue(Json.Arr);
|
||||
WHILE buildArray # NIL DO
|
||||
buildStep := buildArray.value(Json.Obj);
|
||||
NEW(cm, Strings.Length(vpkSettings.bldCommand)+1); (* +1 for 0X *)
|
||||
NEW(fl, Strings.Length(vpkSettings.bldFile)+1); (* +1 for 0X *)
|
||||
COPY(vpkSettings.bldCommand, cm^);
|
||||
COPY(vpkSettings.bldFile, fl^);
|
||||
Out.String("cm^ is"); Out.String(cm^); Out.Ln;
|
||||
Out.String("fl^ is"); Out.String(fl^); Out.Ln;
|
||||
IF Json.ObjSelect(command, buildStep, cm) &
|
||||
Json.ObjSelect(file, buildStep, fl) THEN
|
||||
IF (command IS Json.Str) & (file IS Json.Str) THEN
|
||||
Out.String("Command: "); Out.String(command(Json.Str).str^);
|
||||
Out.String(", File: "); Out.String(file(Json.Str).str^); Out.Ln;
|
||||
IF k = NIL THEN k := StringList.Create() END;
|
||||
IF v = NIL THEN v := StringList.Create() END;
|
||||
k.AppendString(k, command(Json.Str).str^);
|
||||
v.AppendString(v, file(Json.Str).str^);
|
||||
END;
|
||||
END;
|
||||
buildArray := buildArray.next;
|
||||
END;
|
||||
ELSE
|
||||
Out.String("Build section is not an array."); Out.Ln;
|
||||
END;
|
||||
ELSE
|
||||
Out.String("Build section not found."); Out.Ln;
|
||||
END;
|
||||
ELSE
|
||||
Out.String("JSON root is not an object."); Out.Ln;
|
||||
END;
|
||||
ELSE
|
||||
RETURN FALSE
|
||||
END
|
||||
ELSE
|
||||
RETURN FALSE
|
||||
Out.String("JSON parsing failed: "); Out.String(errstr^); Out.Ln;
|
||||
END;
|
||||
END;
|
||||
RETURN b;
|
||||
END getBuildInfo;
|
||||
|
||||
(*
|
||||
PROCEDURE getURIandType*(VAR d: vpkdepTree.Tdep; VAR URI: ARRAY OF CHAR; VAR type: ARRAY OF CHAR; VAR branch: ARRAY OF CHAR);
|
||||
VAR
|
||||
jsonRecord, remote: vpkJsonParser.JsonTypePointer;
|
||||
|
|
@ -52,9 +94,9 @@ BEGIN
|
|||
REPEAT
|
||||
k := keys.GetString(keys, i);
|
||||
v := values.GetString(values, i);
|
||||
IF k^ = vpkSettings.rmtTypKey THEN COPY(v^, type) END;
|
||||
IF k^ = vpkSettings.rmtTreeKey THEN COPY(v^, URI) END;
|
||||
IF k^ = vpkSettings.rmtTreeBranchKey THEN COPY(v^, branch) END;
|
||||
IF k^ = vpkSettings.rmtTypKey THEN COPY(v^, type) END;
|
||||
IF k^ = vpkSettings.rmtTreeKey THEN COPY(v^, URI) END;
|
||||
IF k^ = vpkSettings.rmtTreeBranchKey THEN COPY(v^, branch) END;
|
||||
INC(i);
|
||||
UNTIL i = keys.Count - 1;
|
||||
ELSE
|
||||
|
|
@ -67,7 +109,69 @@ BEGIN
|
|||
HALT(64);
|
||||
END
|
||||
END getURIandType;
|
||||
*)
|
||||
|
||||
PROCEDURE getURIandType*(VAR d: vpkdepTree.Tdep; VAR URI: ARRAY OF CHAR; VAR type: ARRAY OF CHAR; VAR branch: ARRAY OF CHAR);
|
||||
VAR
|
||||
jsonstr, errstr: strUtils.pstring;
|
||||
tree, remoteValue, uriValue, typeValue, branchValue: Json.Value;
|
||||
rootObj, remoteObj: Json.Obj;
|
||||
err: ARRAY ErrmessSize OF CHAR;
|
||||
b: BOOLEAN;
|
||||
u, t, br, remote: Json.jString;
|
||||
BEGIN
|
||||
strUtils.zeroStr(URI);
|
||||
strUtils.zeroStr(type);
|
||||
strUtils.zeroStr(branch);
|
||||
jsonstr := NIL;
|
||||
vpkStorage.json2pstring(d.name^, jsonstr);
|
||||
IF jsonstr # NIL THEN
|
||||
NEW(errstr, ErrmessSize);
|
||||
b := Json.Parse(tree, jsonstr^, err);
|
||||
IF b THEN
|
||||
IF tree IS Json.Obj THEN
|
||||
rootObj := tree(Json.Obj);
|
||||
NEW(u, Strings.Length(vpkSettings.rmtTreeKey) + 1); COPY(vpkSettings.rmtTreeKey, u^);
|
||||
NEW(t, Strings.Length(vpkSettings.rmtTypKey) + 1); COPY(vpkSettings.rmtTypKey, t^);
|
||||
NEW(br, Strings.Length(vpkSettings.rmtTreeBranchKey) + 1); COPY(vpkSettings.rmtTreeBranchKey, br^);
|
||||
NEW(remote, Strings.Length(vpkSettings.rmtType)+1);
|
||||
COPY(vpkSettings.rmtType, remote^);
|
||||
IF Json.ObjSelect(remoteValue, rootObj, remote) THEN
|
||||
IF remoteValue IS Json.Obj THEN
|
||||
remoteObj := remoteValue(Json.Obj);
|
||||
IF Json.ObjSelect(uriValue, remoteObj, u) THEN
|
||||
IF uriValue IS Json.Str THEN
|
||||
COPY(uriValue(Json.Str).str^, URI);
|
||||
END;
|
||||
END;
|
||||
IF Json.ObjSelect(typeValue, remoteObj, t) THEN
|
||||
IF typeValue IS Json.Str THEN
|
||||
COPY(typeValue(Json.Str).str^, type);
|
||||
END;
|
||||
END;
|
||||
IF Json.ObjSelect(branchValue, remoteObj, br) THEN
|
||||
IF branchValue IS Json.Str THEN
|
||||
COPY(branchValue(Json.Str).str^, branch);
|
||||
END;
|
||||
END;
|
||||
ELSE
|
||||
Out.String("Remote section is not an object."); Out.Ln;
|
||||
END;
|
||||
ELSE
|
||||
Out.String("Remote section not found."); Out.Ln;
|
||||
END;
|
||||
ELSE
|
||||
Out.String("JSON root is not an object."); Out.Ln;
|
||||
END;
|
||||
ELSE
|
||||
Out.String("JSON parsing failed: "); Out.String(err); Out.Ln;
|
||||
END;
|
||||
ELSE
|
||||
Out.String("No JSON string provided."); Out.Ln;
|
||||
END;
|
||||
END getURIandType;
|
||||
|
||||
(*
|
||||
(* returns -1 if no such dependency found, otherwise returns length of depstr string list *)
|
||||
PROCEDURE getDeps*(VAR d: vpkdepTree.Tdep; VAR depstrlist: StringList.TStringList): LONGINT;
|
||||
VAR
|
||||
|
|
@ -84,7 +188,7 @@ BEGIN
|
|||
b := jsonRecord.GetTerminal(jsonRecord, vpkSettings.pkgTypKey, pkgName);
|
||||
IF b THEN
|
||||
dependencies := NIL;
|
||||
Out.String("searching dependencies for '"); Out.String(d.name^); Out.String("'... ");
|
||||
Out.String("searching dependencies for '"); Out.String(d.name^); Out.String("'... ");
|
||||
dependencies := jsonRecord.GetNonTerminal(jsonRecord, vpkSettings.depTypKey);
|
||||
IF dependencies # NIL THEN
|
||||
Out.String("found!"); Out.Ln;
|
||||
|
|
@ -102,6 +206,54 @@ BEGIN
|
|||
RETURN -1 (* no such json file found *)
|
||||
END;
|
||||
END getDeps;
|
||||
*)
|
||||
|
||||
PROCEDURE getDeps*(VAR d: vpkdepTree.Tdep; VAR depstrlist: StringList.TStringList): LONGINT;
|
||||
VAR
|
||||
jsonstr, errstr: strUtils.pstring;
|
||||
tree, depsValue, dep: Json.Value;
|
||||
rootObj: Json.Obj;
|
||||
depName: Json.jString;
|
||||
b: BOOLEAN;
|
||||
BEGIN
|
||||
depstrlist := NIL;
|
||||
jsonstr := NIL;
|
||||
vpkStorage.json2pstring(d.name^, jsonstr);
|
||||
IF jsonstr # NIL THEN
|
||||
NEW(errstr, ErrmessSize);
|
||||
b := Json.Parse(tree, jsonstr^, errstr^);
|
||||
IF b THEN
|
||||
IF tree IS Json.Obj THEN
|
||||
rootObj := tree(Json.Obj);
|
||||
NEW(depName, Strings.Length(vpkSettings.depTypKey) + 1);
|
||||
COPY(vpkSettings.depTypKey, depName^);
|
||||
IF Json.ObjSelect(depsValue, rootObj, depName) THEN
|
||||
IF depsValue IS Json.Obj THEN
|
||||
dep := depsValue(Json.Obj).value;
|
||||
WHILE dep # NIL DO
|
||||
IF dep IS Json.Obj THEN
|
||||
depstrlist.AppendString(depstrlist, dep(Json.Obj).name^);
|
||||
END;
|
||||
dep := dep(Json.Obj).next;
|
||||
END;
|
||||
RETURN depstrlist.Count;
|
||||
ELSE
|
||||
Out.String("Dependencies section is not an object."); Out.Ln;
|
||||
END;
|
||||
ELSE
|
||||
Out.String("Dependencies section not found."); Out.Ln;
|
||||
END;
|
||||
ELSE
|
||||
Out.String("JSON root is not an object."); Out.Ln;
|
||||
END;
|
||||
ELSE
|
||||
Out.String("JSON parsing failed: "); Out.String(errstr^); Out.Ln;
|
||||
END;
|
||||
ELSE
|
||||
RETURN -1; (* no such json file found *)
|
||||
END;
|
||||
RETURN 0;
|
||||
END getDeps;
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue