diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c90a427 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +./builds \ No newline at end of file diff --git a/CharacterStack.Mod b/CharacterStack.Mod index 6f3a66b..8f46cbb 100644 --- a/CharacterStack.Mod +++ b/CharacterStack.Mod @@ -88,7 +88,7 @@ BEGIN END Create; BEGIN - NEW(characterStack); + (* NEW(characterStack); characterStack := Create(); characterStack.push(characterStack, 'a'); characterStack.push(characterStack, 'b'); @@ -117,5 +117,5 @@ BEGIN Out.Char(characterStack.top(characterStack)); Out.Ln(); Out.Char(characterStack.pop(characterStack)); - Out.Ln(); + Out.Ln(); *) END CharacterStack. \ No newline at end of file diff --git a/HashMap b/HashMap deleted file mode 100755 index 2d122ed..0000000 Binary files a/HashMap and /dev/null differ diff --git a/HashMapString.Mod b/HashMapString.Mod index 5cf3772..1e51fd0 100644 --- a/HashMapString.Mod +++ b/HashMapString.Mod @@ -1,5 +1,5 @@ MODULE HashMap; -IMPORT Logger, CharacterStack, Strings; +IMPORT Logger, CharacterStack, Strings, Out; CONST ArrayMaxNumber = 5000; TYPE @@ -48,8 +48,6 @@ BEGIN REPEAT symbol := text[i]; - INC(i); - IF symbol = symbolBracketStart THEN Logger.Log("Starting Parse Json"); END; @@ -57,8 +55,12 @@ BEGIN IF symbol = symbolBracketStart THEN Logger.Log("End Parsing Json"); END; + INC(i); + Logger.LogInt(i); UNTIL text[i] = 0AX; - + + Out.String(" test"); + RETURN jsonRecord; END Create; diff --git a/build.sh b/build.sh deleted file mode 100644 index f9383ae..0000000 --- a/build.sh +++ /dev/null @@ -1,9 +0,0 @@ -#/bin/bash - -voc -s \ - ./time.Mod \ - ./logger.Mod \ - ./diaspora2hugo/src/lists/Sys.Mod \ - ./diaspora2hugo/src/lists/List.Mod \ - ./CharacterStack.Mod \ - ./HashMapString.Mod -m \ No newline at end of file diff --git a/logger.Mod b/logger.Mod index 0ef60aa..5b6c724 100644 --- a/logger.Mod +++ b/logger.Mod @@ -1,23 +1,35 @@ MODULE Logger; IMPORT time, Out; +PROCEDURE LogInt*(number: LONGINT); +VAR + i: LONGINT; +BEGIN + WHILE number>10 DO + number := number DIV 10; + INC(i); + END; + + Out.Int(number, i); +END LogInt; + PROCEDURE Log*(buff: ARRAY OF CHAR); VAR year, month, day, hour, min, sec: LONGINT; BEGIN time.Now(year, month, day, hour, min, sec); - Out.Int(year, 4); + LogInt(year); Out.String("/"); - Out.Int(month, 2); + LogInt(month); Out.String("/"); - Out.Int(day, 2); + LogInt(day); Out.String(" "); - Out.Int(hour, 2); + LogInt(hour); Out.String("-"); - Out.Int(min, 2); + LogInt(min); Out.String("-"); - Out.Int(sec, 2); + LogInt(sec); Out.String(" "); Out.String(buff); Out.Ln; diff --git a/makefile b/makefile index 99f5d4e..46d83f1 100644 --- a/makefile +++ b/makefile @@ -2,19 +2,20 @@ VOC = /opt/voc/bin/voc all: - $(VOC) -s types.Mod sockets.Mod netdb.Mod Internet.Mod stringHelpers.Mod time.Mod IRC.Mod test.Mod -m - -http: - $(VOC) -s types.Mod sockets.Mod netdb.Mod Internet.Mod time.Mod logger.Mod http.Mod -m + cd builds && \ + $(VOC) -s \ + ../time.Mod \ + ../logger.Mod \ + ../diaspora2hugo/src/lists/Sys.Mod \ + ../diaspora2hugo/src/lists/List.Mod \ + ../CharacterStack.Mod \ + ../HashMapString.Mod -m clean: - rm *.h & - rm *.c & - rm *.o & - rm *.sym & - rm http & - rm CharaterStack & + cd builds && rm * & -test: clean http - ./http +run: + ./builds/HashMap + +test: clean all run \ No newline at end of file