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

View file

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