diff --git a/HashMapString.Mod b/HashMapString.Mod index 1e51fd0..ec53028 100644 --- a/HashMapString.Mod +++ b/HashMapString.Mod @@ -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; diff --git a/logger.Mod b/logger.Mod index 5fd0786..70ea588 100644 --- a/logger.Mod +++ b/logger.Mod @@ -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. \ No newline at end of file