From 2de4b7b38fc286b0e651232c0365e70c07005c8f Mon Sep 17 00:00:00 2001 From: sts-q Date: Fri, 25 Mar 2022 20:26:15 +0100 Subject: [PATCH 1/2] SKL.Mod Minimal changes to code formating. --- system/SKL.Mod | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/system/SKL.Mod b/system/SKL.Mod index ca364c1..86b4188 100644 --- a/system/SKL.Mod +++ b/system/SKL.Mod @@ -14,7 +14,7 @@ MODULE SKL; DN:=SKLDN, TH:=SKLTH, Kernel; - + CONST SignOnMessage = "LMSO SKL Compiler TWH 2022.02.09"; @@ -37,7 +37,7 @@ MODULE SKL; CGL.ModuleBegin; CGH.ModuleBegin; TT.ModuleBegin; (* before allocation *) - + OPM.NewRefObj(mod(T.Enter).info.name^); ASSERT((mod.class = T.Nstmt) & (mod.subcl = T.Senter)); ASSERT(ST.topScope # NIL); @@ -49,15 +49,21 @@ MODULE SKL; END; TT.Module(mod, inittd, err); - + IF ~err THEN CGL.OutCode(mod(T.Enter).info.name^); - IF new THEN OPM.LogWStr(" new symbol file") - ELSIF ext THEN OPM.LogWStr(" extended symbol file") + IF new THEN + OPM.LogWStr(" new symbol file") + ELSIF ext THEN + OPM.LogWStr(" extended symbol file") END ; - OPM.LogWNum(CGL.pc, 8); OPM.LogWStr(' bytes code '); - OPM.LogWNum(-ST.topScope(ST.SymbolScope).dsize, 8); OPM.LogWStr(' bytes data'); - ELSE OPM.DeleteNewSym; OPM.DeleteRefObj; + OPM.LogWNum(CGL.pc, 8); + OPM.LogWStr(' bytes code '); + OPM.LogWNum(-ST.topScope(ST.SymbolScope).dsize, 8); + OPM.LogWStr(' bytes data'); + ELSE + OPM.DeleteNewSym; + OPM.DeleteRefObj; END; END; @@ -81,12 +87,17 @@ MODULE SKL; PROCEDURE Do(VAR FileInfo : OPM.SourceInfo); VAR S1: Texts.Scanner; BEGIN - OPM.LogWStr(FileInfo.filename); OPM.LogWStr(" compiling "); + OPM.LogWStr(FileInfo.filename); + OPM.LogWStr(" compiling "); IF FileInfo.source # NIL THEN - Texts.OpenScanner(S1, FileInfo.source, FileInfo.beg); Texts.Scan(S1); + Texts.OpenScanner(S1, FileInfo.source, FileInfo.beg); + Texts.Scan(S1); - IF (S1.class = Texts.Name) & (S1.s = "MODULE") THEN Texts.Scan(S1); - IF S1.class = Texts.Name THEN OPM.LogWStr(S1.s) END + IF (S1.class = Texts.Name) & (S1.s = "MODULE") THEN + Texts.Scan(S1); + IF S1.class = Texts.Name THEN + OPM.LogWStr(S1.s) + END END ; Module(FileInfo, err); END ; @@ -114,7 +125,7 @@ MODULE SKL; END; OPM.LogW(')'); END OnOff; - + PROCEDURE Banner; BEGIN OPM.LogWStr('A: assertion evaluation'); OnOff(OPM.Assert IN source.options); OPM.LogWLn; From 3da241cc48e63fb0699ff20c6a3cc78801b6c554 Mon Sep 17 00:00:00 2001 From: sts-q Date: Fri, 25 Mar 2022 21:26:56 +0100 Subject: [PATCH 2/2] SKL.Mod Modified output to screen per compiled module. The line length printed to screen per module is shortened to less than 100 characters. --- system/SKL.Mod | 47 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 9 deletions(-) diff --git a/system/SKL.Mod b/system/SKL.Mod index 86b4188..41e76b6 100644 --- a/system/SKL.Mod +++ b/system/SKL.Mod @@ -22,7 +22,12 @@ MODULE SKL; source : OPM.SourceInfo; PROCEDURE Module*(FileInfo : OPM.SourceInfo; VAR error: BOOLEAN); - VAR ext, new: BOOLEAN; mod: T.Node; inittd : T.InitTD; err : BOOLEAN; + VAR + ext, new: BOOLEAN; + mod: T.Node; + inittd : T.InitTD; + err : BOOLEAN; + i: INTEGER; BEGIN OPM.ModuleBegin(FileInfo); OPS.ModuleBegin; @@ -53,14 +58,20 @@ MODULE SKL; IF ~err THEN CGL.OutCode(mod(T.Enter).info.name^); IF new THEN - OPM.LogWStr(" new symbol file") + OPM.LogWStr("new symbol file ") ELSIF ext THEN - OPM.LogWStr(" extended symbol file") + OPM.LogWStr("extended symbol file") + ELSE + OPM.LogWStr(" ") END ; OPM.LogWNum(CGL.pc, 8); - OPM.LogWStr(' bytes code '); - OPM.LogWNum(-ST.topScope(ST.SymbolScope).dsize, 8); - OPM.LogWStr(' bytes data'); + OPM.LogWStr(" "); + IF -ST.topScope(ST.SymbolScope).dsize # 0 THEN + OPM.LogWNum(-ST.topScope(ST.SymbolScope).dsize, 8); + ELSE + OPM.LogWStr(" "); + END; + OPM.LogWStr(' '); ELSE OPM.DeleteNewSym; OPM.DeleteRefObj; @@ -85,10 +96,20 @@ MODULE SKL; VAR err : BOOLEAN; PROCEDURE Do(VAR FileInfo : OPM.SourceInfo); - VAR S1: Texts.Scanner; + VAR + S1: Texts.Scanner; + i: INTEGER; BEGIN OPM.LogWStr(FileInfo.filename); - OPM.LogWStr(" compiling "); + i := 0; + WHILE FileInfo.filename[i] # 0X DO + INC(i); + END; + WHILE i < 20 DO + OPM.LogW(" "); + INC(i) + END; + OPM.LogWStr(" "); IF FileInfo.source # NIL THEN Texts.OpenScanner(S1, FileInfo.source, FileInfo.beg); Texts.Scan(S1); @@ -96,7 +117,15 @@ MODULE SKL; IF (S1.class = Texts.Name) & (S1.s = "MODULE") THEN Texts.Scan(S1); IF S1.class = Texts.Name THEN - OPM.LogWStr(S1.s) + OPM.LogWStr(S1.s); + i := 0; + WHILE S1.s[i] # 0X DO + INC(i) + END; + WHILE i < 15 DO + OPM.LogW(" "); + INC(i) + END END END ; Module(FileInfo, err);