mirror of
https://github.com/vishapoberon/vipak.git
synced 2026-04-05 20:42:26 +00:00
Everething is broken, life is miserable
This commit is contained in:
parent
344c0f0aa7
commit
1f1763abff
3 changed files with 15 additions and 9 deletions
|
|
@ -1,7 +1,7 @@
|
||||||
MODULE DependencyResolver;
|
MODULE DependencyResolver;
|
||||||
IMPORT JsonParser, Settings, PackageResolver, Strings, Logger;
|
IMPORT JsonParser, Settings, PackageResolver, Strings, Logger;
|
||||||
|
|
||||||
CONST ArrayMaxNumber = 10000;
|
CONST ArrayMaxNumber = 30;
|
||||||
|
|
||||||
VAR
|
VAR
|
||||||
moduleNames: ARRAY ArrayMaxNumber OF JsonParser.TString;
|
moduleNames: ARRAY ArrayMaxNumber OF JsonParser.TString;
|
||||||
|
|
@ -13,7 +13,7 @@ PROCEDURE Resolve *(jsonString: ARRAY OF CHAR);
|
||||||
VAR
|
VAR
|
||||||
jsonRecord, dependencies: JsonParser.JsonTypePointer;
|
jsonRecord, dependencies: JsonParser.JsonTypePointer;
|
||||||
keyFound: BOOLEAN;
|
keyFound: BOOLEAN;
|
||||||
packageName, version, returnedJSON: ARRAY ArrayMaxNumber OF CHAR;
|
packageName, version, returnedJSON: JsonParser.TString;
|
||||||
keys: ARRAY ArrayMaxNumber OF JsonParser.TString;
|
keys: ARRAY ArrayMaxNumber OF JsonParser.TString;
|
||||||
i, k : LONGINT;
|
i, k : LONGINT;
|
||||||
BEGIN
|
BEGIN
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,8 @@
|
||||||
MODULE JsonParser;
|
MODULE JsonParser;
|
||||||
IMPORT Logger, CharacterStack, Strings, Out, strutils;
|
IMPORT Logger, CharacterStack, Strings, Out, strutils;
|
||||||
CONST
|
CONST
|
||||||
ArrayMaxNumber = 10000;
|
ArrayMaxNumber = 30;
|
||||||
|
ArrayMaxNumberChar = 1000;
|
||||||
(* Const *)
|
(* Const *)
|
||||||
symbolBracketStart = "{";
|
symbolBracketStart = "{";
|
||||||
symbolBracketEnd = "}";
|
symbolBracketEnd = "}";
|
||||||
|
|
@ -9,7 +10,7 @@ CONST
|
||||||
quote = "'";
|
quote = "'";
|
||||||
coma = ",";
|
coma = ",";
|
||||||
TYPE
|
TYPE
|
||||||
TString* = ARRAY ArrayMaxNumber OF CHAR;
|
TString* = ARRAY ArrayMaxNumberChar OF CHAR;
|
||||||
|
|
||||||
JsonTypePointer* = POINTER TO JsonType;
|
JsonTypePointer* = POINTER TO JsonType;
|
||||||
|
|
||||||
|
|
@ -39,6 +40,8 @@ VAR
|
||||||
BEGIN
|
BEGIN
|
||||||
FOR i := 0 TO LEN(self.NonTerminalKeys) - 1 DO
|
FOR i := 0 TO LEN(self.NonTerminalKeys) - 1 DO
|
||||||
IF Strings.Match(key, self.NonTerminalKeys[i]) THEN RETURN self.NonTerminalValues[i] END;
|
IF Strings.Match(key, self.NonTerminalKeys[i]) THEN RETURN self.NonTerminalValues[i] END;
|
||||||
|
Logger.Log(key);
|
||||||
|
Logger.Log(self.NonTerminalKeys[i]);
|
||||||
END;
|
END;
|
||||||
|
|
||||||
RETURN NIL;
|
RETURN NIL;
|
||||||
|
|
@ -84,7 +87,7 @@ VAR
|
||||||
i: LONGINT;
|
i: LONGINT;
|
||||||
BEGIN
|
BEGIN
|
||||||
FOR i := 0 TO LEN(self.TerminalKeys) - 1 DO
|
FOR i := 0 TO LEN(self.TerminalKeys) - 1 DO
|
||||||
destination[i] := self.TerminalKeys[i];
|
COPY(self.TerminalKeys[i], destination[i]);
|
||||||
END;
|
END;
|
||||||
END GetTerminalKeys;
|
END GetTerminalKeys;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@ IMPORT
|
||||||
DependencyResolver,
|
DependencyResolver,
|
||||||
Settings;
|
Settings;
|
||||||
CONST
|
CONST
|
||||||
MAXARRAYNUMBER = 1000000;
|
MAXARRAYNUMBER = 10000;
|
||||||
PROCEDURE install*;
|
PROCEDURE install*;
|
||||||
VAR
|
VAR
|
||||||
jsonData: ARRAY MAXARRAYNUMBER OF CHAR;
|
jsonData: ARRAY MAXARRAYNUMBER OF CHAR;
|
||||||
|
|
@ -19,6 +19,9 @@ BEGIN
|
||||||
IF ~success THEN Logger.Log("Some ERROR occured while reading VERSIONFILE") END;
|
IF ~success THEN Logger.Log("Some ERROR occured while reading VERSIONFILE") END;
|
||||||
ASSERT(success);
|
ASSERT(success);
|
||||||
|
|
||||||
|
Logger.Log("Starting resolving dependencies");
|
||||||
|
Logger.Log(jsonData);
|
||||||
|
|
||||||
DependencyResolver.Resolve(jsonData);
|
DependencyResolver.Resolve(jsonData);
|
||||||
END install;
|
END install;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue