Logger extended

This commit is contained in:
Ruben Shekspir 2019-04-21 12:20:40 +04:00
parent 052ecfbe12
commit d7a574ce89
2 changed files with 22 additions and 13 deletions

View file

@ -1,14 +1,14 @@
MODULE HashMap;
IMPORT Logger, CharacterStack, Strings, Out;
IMPORT Logger, CharacterStack, Strings;
CONST
ArrayMaxNumber = 5000;
symbolBracketStart = "{";
symbolBracketEnd = "}";
TYPE
TString = ARRAY ArrayMaxNumber OF CHAR;
JsonTypePointer* = POINTER TO JsonType;
JsonType* = RECORD
GetTerminal* : PROCEDURE(self : JsonTypePointer; string : ARRAY OF CHAR; VAR returnValue : ARRAY OF CHAR);
GetNonTerminal* : PROCEDURE(self : JsonTypePointer; key : ARRAY OF CHAR): JsonTypePointer;
@ -26,22 +26,20 @@ VAR
jsonRecord :JsonTypePointer;
PROCEDURE Create*(text: ARRAY OF CHAR): JsonTypePointer;
VAR
jsonRecord: JsonTypePointer;
everethingIsOK: BOOLEAN;
i,j: INTEGER;
characterStack: CharacterStack.CharacterStackType;
key, val: ARRAY ArrayMaxNumber OF CHAR;
symbol: CHAR;
symbolBracketStart, symbolBracketEnd, symbolStart: CHAR;
symbolStart: CHAR;
BEGIN
NEW(jsonRecord);
NEW(characterStack);
characterStack := CharacterStack.Create();
symbolBracketStart := "{";
symbolBracketEnd := "}";
i := 0;
j := 0;
@ -56,10 +54,8 @@ BEGIN
Logger.Log("End Parsing Json");
END;
INC(i);
Logger.LogInt(i);
UNTIL text[i] = 0AX;
Out.String(" test");
UNTIL i > LEN(text) - 1;
(* UNTIL text[i] = 0AX; TODO: Ask Norayr *)
RETURN jsonRecord;
END Create;

View file

@ -23,6 +23,11 @@ BEGIN
Out.Int(number, GetDecas(number));
END LogInt;
PROCEDURE LogIntLn*(number: LONGINT);
BEGIN
LogInt(number);
Out.Ln();
END LogIntLn;
PROCEDURE LogNormalized*(number, normal: LONGINT);
VAR
@ -55,9 +60,17 @@ BEGIN
LogNormalized(min, 2);
Out.String("-");
LogNormalized(sec, 2);
Out.String(" ");
Out.String(" :- ");
Out.String(buff);
Out.Ln;
END Log;
PROCEDURE Char*(char: CHAR);
VAR
string :ARRAY 1 OF CHAR;
BEGIN
string[0] :=char;
Log(string);
END Char;
END Logger.