diff --git a/05vishap.conf b/05vishap.conf index 7a43aef3..98072b24 100644 --- a/05vishap.conf +++ b/05vishap.conf @@ -1 +1 @@ -/Users/noch/local/voc-1.0/lib +/opt/voc-1.0/lib diff --git a/ocat b/ocat index 1340df2c..5b2eb654 100755 Binary files a/ocat and b/ocat differ diff --git a/showdef b/showdef index bea7ea7c..77f0406a 100755 Binary files a/showdef and b/showdef differ diff --git a/src/voc/OPM.cmdln.Mod b/src/voc/OPM.cmdln.Mod index 049585e3..7e3ff0be 100644 --- a/src/voc/OPM.cmdln.Mod +++ b/src/voc/OPM.cmdln.Mod @@ -121,7 +121,7 @@ MODULE OPM; (* RC 6.3.89 / 28.6.89, J.Templ 10.7.89 / 22.7.96 *) oldSFile, newSFile, HFile, BFile, HIFile: Files.File; S: INTEGER; - stop, useLineNo, useParFile, dontAsm-, dontLink-, mainProg-, mainLinkStat-, notColorOutput: BOOLEAN; + stop, useLineNo, useParFile, dontAsm-, dontLink-, mainProg-, mainLinkStat-, notColorOutput-: BOOLEAN; (* ------------------------- Log Output ------------------------- *) @@ -190,7 +190,7 @@ MODULE OPM; (* RC 6.3.89 / 28.6.89, J.Templ 10.7.89 / 22.7.96 *) Console.Ln; Console.String(' command = "voc" options {file options}.'); Console.Ln; Console.String(' options = ["-" {option} ].'); Console.Ln; - Console.String(' option = "m" | "M" | "s" | "e" | "i" | "l" | "k" | "r" | "x" | "a" | "p" | "t" | "P" | "S" | "c" .'); Console.Ln; + Console.String(' option = "m" | "M" | "s" | "e" | "i" | "l" | "k" | "r" | "x" | "a" | "p" | "t" | "P" | "S" | "c" | "f" .'); Console.Ln; Console.Ln; Console.String(" m - generate code for main module"); Console.Ln; Console.String(" M - generate code for main module and link object statically"); Console.Ln; diff --git a/src/voc/prf.Mod b/src/voc/prf.Mod index d97f3ae5..2f4d8f24 100644 --- a/src/voc/prf.Mod +++ b/src/voc/prf.Mod @@ -1,5 +1,5 @@ MODULE prf; -CONST prefix* = "/Users/noch/local"; +CONST prefix* = "/opt"; END prf. diff --git a/src/voc/voc.Mod b/src/voc/voc.Mod index aff24e52..5ebc2076 100644 --- a/src/voc/voc.Mod +++ b/src/voc/voc.Mod @@ -4,7 +4,7 @@ MODULE voc; (* J. Templ 3.2.95 *) SYSTEM, Unix, Kernel := Kernel0, OPP, OPB, OPT, OPV, OPC, OPM, - extTools, Strings; + extTools, Strings, vt100; VAR mname : ARRAY 256 OF CHAR; (* noch *) @@ -49,7 +49,11 @@ VAR mname : ARRAY 256 OF CHAR; (* noch *) IF (OPM.mainProg OR OPM.mainLinkStat) & (OPM.modName # "SYSTEM") THEN OPM.DeleteNewSym; OPM.LogWStr(" main program") ELSE - IF new THEN OPM.LogWStr(" new symbol file"); OPM.RegisterNewSym + IF new THEN + IF ~OPM.notColorOutput THEN vt100.SetAttr(vt100.Green) END; + OPM.LogWStr(" new symbol file"); + IF ~OPM.notColorOutput THEN vt100.SetAttr(vt100.ResetAll) END; + OPM.RegisterNewSym ELSIF ext THEN OPM.LogWStr(" extended symbol file"); OPM.RegisterNewSym END END; diff --git a/voc b/voc index 42bb6261..77a2f7c8 100755 Binary files a/voc and b/voc differ diff --git a/vocstatic.linux.gcc.powerpc b/vocstatic.linux.gcc.powerpc index 594af660..77a2f7c8 100755 Binary files a/vocstatic.linux.gcc.powerpc and b/vocstatic.linux.gcc.powerpc differ