diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-07-03 16:53:30 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-07-03 16:53:30 +0000 |
| commit | 67a9b503724a4390abf08baa367959713483f363 (patch) | |
| tree | 6380b619a86bb58768d8bb3e37387acd808ed6f6 /src/interp | |
| parent | cd75300236a7e0bd4b2ba0818721deb92c522aa7 (diff) | |
| download | open-axiom-67a9b503724a4390abf08baa367959713483f363.tar.gz | |
* boot/tokens.boot: flushOutput, writeNewline, writeString
are new builtin library functions.
* boot/utility.boot (finishLine): New exported function.
* interp/i-output.boot (formulaFormat): Use it.
(texFormat): Likewise.
(texFormat1): Likewise.
(mathmlFormat): Likewise.
(output): Remove case for TextWriter.
Diffstat (limited to 'src/interp')
| -rw-r--r-- | src/interp/i-output.boot | 21 | ||||
| -rw-r--r-- | src/interp/i-util.boot | 2 | ||||
| -rw-r--r-- | src/interp/server.boot | 2 |
3 files changed, 7 insertions, 18 deletions
diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot index 1b914f97..baaf707f 100644 --- a/src/interp/i-output.boot +++ b/src/interp/i-output.boot @@ -1530,8 +1530,7 @@ formulaFormat expr == displayFn := getFunctionFromDomain("display",sff,[sff]) SPADCALL(SPADCALL(expr,formatFn),displayFn) if not $collectOutput then - TERPRI $algebraOutputStream - FORCE_-OUTPUT $formulaOutputStream + finishLine $algebraOutputStream nil texFormat expr == @@ -1540,8 +1539,7 @@ texFormat expr == getFunctionFromDomain("convert",tf,[$OutputForm,$Integer]) displayFn := getFunctionFromDomain("display",tf,[tf]) SPADCALL(SPADCALL(expr,$IOindex,formatFn),displayFn) - TERPRI $texOutputStream - FORCE_-OUTPUT $texOutputStream + finishLine $texOutputStream nil texFormat1 expr == @@ -1549,8 +1547,7 @@ texFormat1 expr == formatFn := getFunctionFromDomain("coerce",tf, [$OutputForm]) displayFn := getFunctionFromDomain("display",tf,[tf]) SPADCALL(SPADCALL(expr,formatFn),displayFn) - TERPRI $texOutputStream - FORCE_-OUTPUT $texOutputStream + finishLine $texOutputStream nil mathmlFormat expr == @@ -1559,8 +1556,7 @@ mathmlFormat expr == formatFn := getFunctionFromDomain("coerce",mml,[$OutputForm]) displayFn := getFunctionFromDomain("display",mml,[mmlrep]) SPADCALL(SPADCALL(expr,formatFn),displayFn) - TERPRI $mathmlOutputStream - FORCE_-OUTPUT $mathmlOutputStream + finishLine $mathmlOutputStream nil output(expr,domain) == @@ -1581,18 +1577,11 @@ output(expr,domain) == if $fortranFormat then dispfortexp x if not $collectOutput then TERPRI $fortranOutputStream - FORCE_-OUTPUT $fortranOutputStream + flushOutput $fortranOutputStream if $algebraFormat then mathprintWithNumber(x,domain) if $texFormat then texFormat x if $mathmlFormat then mathmlFormat x - (function?(opOf domain)) and - (printfun := compiledLookup("<<",'(TextWriter TextWriter $), evalDomain domain)) - and (textwrit := compiledLookup("print", '($), TextWriter())) => - sayMSGNT [:bright '"AXIOM-XL",'"output: "] - SPADCALL(SPADCALL textwrit, expr, printfun) - sayMSGNT '"%l" - sayMSG [:bright '"LISP",'"output:",'"%l",expr or '"NIL"] outputNumber(start,linelength,num) == diff --git a/src/interp/i-util.boot b/src/interp/i-util.boot index e51a5702..9d582213 100644 --- a/src/interp/i-util.boot +++ b/src/interp/i-util.boot @@ -80,7 +80,7 @@ MKPROMPT() == printPrompt(flush? == false) == PRINC(MKPROMPT(), $OutputStream) if flush? then - FORCE_-OUTPUT $OutputStream + flushOutput $OutputStream ++ Return the name of a text editor, if possible. textEditor() == diff --git a/src/interp/server.boot b/src/interp/server.boot index 6455f880..3b0daff5 100644 --- a/src/interp/server.boot +++ b/src/interp/server.boot @@ -48,7 +48,7 @@ $sockBufferLength := 9217 serverReadLine(stream) == -- used in place of READ-LINE in a scratchpad server system. - FORCE_-OUTPUT() + flushOutput() not $SpadServer or not IS_-CONSOLE stream => line := readLine stream line ~= %nothing => line |