diff options
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/interp/i-output.boot | 15 | ||||
| -rw-r--r-- | src/interp/macros.lisp | 3 | ||||
| -rw-r--r-- | src/interp/msg.boot | 14 |
4 files changed, 22 insertions, 17 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index dc33a80c..48682b48 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2011-07-02 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * interp/macros.lisp (sayALGEBRA): Remove as duplicate of sayMSG. + * interp/i-output.boot: Replace sayALGBEBRA with sayMSG. + * interp/msg.boot (ncHardError): Remove dead variable ergMsg. + (ncBug): Likewise. + 2011-07-01 Gabriel Dos Reis <gdr@cs.tamu.edu> * gui/conversation.h (OutputTextArea): Now inherit from diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot index 397f76c6..1b914f97 100644 --- a/src/interp/i-output.boot +++ b/src/interp/i-output.boot @@ -489,7 +489,7 @@ mathprint(x,out == $OutputStream) == sayMath u == for x in u repeat acc:= concat(acc,linearFormatName x) - sayALGEBRA acc + sayMSG acc --% Output transformations @@ -1485,7 +1485,7 @@ xLate(l,x,y,d) == concatTrouble(u,d,start,lineLength,$addBlankIfTrue) == [x,:l] := splitConcat(u,lineLength,true) null l => - sayALGEBRA ['"%l",'"%b",'" Too wide to Print",'"%d"] + sayMSG ['"%l",'"%b",'" Too wide to Print",'"%d"] THROW('output,nil) charybdis(fixUp x,start,lineLength) for y in l repeat @@ -1593,7 +1593,7 @@ output(expr,domain) == SPADCALL(SPADCALL textwrit, expr, printfun) sayMSGNT '"%l" - sayALGEBRA [:bright '"LISP",'"output:",'"%l",expr or '"NIL"] + sayMSG [:bright '"LISP",'"output:",'"%l",expr or '"NIL"] outputNumber(start,linelength,num) == if start > 1 then blnks := fillerSpaces(start-1,char " ") @@ -1607,8 +1607,7 @@ outputNumber(start,linelength,num) == $outputLines := [strconc(blnks, subString(num,0,linelength),under), :$outputLines] else - sayALGEBRA [blnks, - subString(num,0,linelength),under] + sayMSG [blnks, subString(num,0,linelength),under] num := subString(num,linelength) if firsttime then blnks:=strconc(blnks,'" ") @@ -1617,7 +1616,7 @@ outputNumber(start,linelength,num) == if $collectOutput then $outputLines := [strconc(blnks, num), :$outputLines] else - sayALGEBRA [blnks, num] + sayMSG [blnks, num] outputString(start,linelength,str) == if start > 1 then blnks := fillerSpaces(start-1,char " ") @@ -1627,12 +1626,12 @@ outputString(start,linelength,str) == $outputLines := [strconc(blnks, subString(str,0,linelength)), :$outputLines] else - sayALGEBRA [blnks, subString(str,0,linelength)] + sayMSG [blnks, subString(str,0,linelength)] str := subString(str,linelength) if $collectOutput then $outputLines := [strconc(blnks, str), :$outputLines] else - sayALGEBRA [blnks, str] + sayMSG [blnks, str] outputDomainConstructor form == if VECTORP form then form := devaluate form diff --git a/src/interp/macros.lisp b/src/interp/macros.lisp index bdc4d7e7..13018ade 100644 --- a/src/interp/macros.lisp +++ b/src/interp/macros.lisp @@ -371,9 +371,6 @@ (TERPRI out) (force-output out)))) -(defun |sayALGEBRA| (X) "Prints on Algebra output stream." - (if (NULL X) NIL (sayBrightly1 X |$algebraOutputStream|))) - (defun |sayMSG| (X) (if (NULL X) NIL (sayBrightly1 X |$algebraOutputStream|))) diff --git a/src/interp/msg.boot b/src/interp/msg.boot index fcffa99e..cb84d186 100644 --- a/src/interp/msg.boot +++ b/src/interp/msg.boot @@ -65,7 +65,7 @@ $ncMsgList := [] ncSoftError(pos, erMsgKey, erArgL,:optAttr) == $newcompErrorCount := $newcompErrorCount + 1 desiredMsg erMsgKey => - processKeyedError _ + processKeyedError msgCreate ('error, pos, erMsgKey, erArgL, $compErrorPrefix,optAttr) -- The program being compiled is seriously incorrect. @@ -73,14 +73,14 @@ ncSoftError(pos, erMsgKey, erArgL,:optAttr) == ncHardError(pos, erMsgKey, erArgL,:optAttr) == $newcompErrorCount := $newcompErrorCount + 1 desiredMsg erMsgKey => - erMsg := processKeyedError _ + processKeyedError msgCreate('error,pos,erMsgKey, erArgL, $compErrorPrefix,optAttr) ncError() -- Bug in the compiler: something which shouldn't have happened did. ncBug (erMsgKey, erArgL,:optAttr) == $newcompErrorCount := $newcompErrorCount + 1 - erMsg := processKeyedError _ + processKeyedError msgCreate('bug,$nopos, erMsgKey, erArgL,$compBugPrefix,optAttr) BREAK() ncAbort() @@ -331,13 +331,15 @@ msgOutputter msg == st := flowSegmentedMsg(st,$LOGLENGTH,0) alreadyOpened := alreadyOpened? msg -toScreen? msg == getMsgToWhere msg ~= 'fileOnly +toScreen? msg == + getMsgToWhere msg ~= 'fileOnly + toFile? msg == - getMsgToWhere msg ~= 'screenOnly + getMsgToWhere msg ~= 'screenOnly alreadyOpened? msg == - not msgImPr? msg + not msgImPr? msg getStFromMsg msg == $optKeyBlanks : local := '"" --set in setOptKeyBlanks() |