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/boot/strap | |
| 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/boot/strap')
| -rw-r--r-- | src/boot/strap/tokens.clisp | 10 | ||||
| -rw-r--r-- | src/boot/strap/utility.clisp | 7 |
2 files changed, 13 insertions, 4 deletions
diff --git a/src/boot/strap/tokens.clisp b/src/boot/strap/tokens.clisp index 41ae0b5d..703b4263 100644 --- a/src/boot/strap/tokens.clisp +++ b/src/boot/strap/tokens.clisp @@ -215,8 +215,9 @@ (LIST '|croak| 'CROAK) (LIST '|digit?| 'DIGIT-CHAR-P) (LIST '|drop| 'DROP) (LIST '|exit| 'EXIT) (LIST '|false| 'NIL) (LIST '|first| 'CAR) - (LIST '|float?| 'FLOATP) (LIST '|fourth| 'CADDDR) - (LIST '|function| 'FUNCTION) + (LIST '|float?| 'FLOATP) + (LIST '|flushOutput| 'FORCE-OUTPUT) + (LIST '|fourth| 'CADDDR) (LIST '|function| 'FUNCTION) (LIST '|function?| 'FUNCTIONP) (LIST '|gensym| 'GENSYM) (LIST '|genvar| 'GENVAR) (LIST '|integer?| 'INTEGERP) (LIST 'LAST '|last|) (LIST '|list| 'LIST) @@ -255,7 +256,10 @@ (LIST '|vector?| 'SIMPLE-VECTOR-P) (LIST '|vectorRef| 'SVREF) (LIST '|writeByte| 'WRITE-BYTE) - (LIST '|writeLine| 'WRITE-LINE) (LIST 'PLUS '+) + (LIST '|writeChar| 'WRITE-CHAR) + (LIST '|writeLine| 'WRITE-LINE) + (LIST '|writeNewline| 'TERPRI) + (LIST '|writeString| 'WRITE-STRING) (LIST 'PLUS '+) (LIST 'MINUS '-) (LIST 'TIMES '*) (LIST 'POWER 'EXPT) (LIST 'REM 'REM) (LIST 'QUO 'TRUNCATE) (LIST 'SLASH '/) (LIST 'LT '<) (LIST 'GT '>) (LIST 'LE '<=) diff --git a/src/boot/strap/utility.clisp b/src/boot/strap/utility.clisp index a832a3ce..75416004 100644 --- a/src/boot/strap/utility.clisp +++ b/src/boot/strap/utility.clisp @@ -11,7 +11,7 @@ |reverse!| |lastNode| |append| |append!| |copyList| |substitute| |substitute!| |setDifference| |applySubst| |applySubst!| |applySubstNQ| |remove| |removeSymbol| - |atomic?|))) + |atomic?| |finishLine|))) (DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Thing|) |%Thing|) |substitute|)) @@ -44,6 +44,8 @@ (DECLAIM (FTYPE (FUNCTION (|%Thing|) |%Boolean|) |atomic?|)) +(DECLAIM (FTYPE (FUNCTION (|%Thing|) |%Void|) |finishLine|)) + (DEFUN |atomic?| (|x|) (OR (NOT (CONSP |x|)) (EQ (CAR |x|) 'QUOTE))) (DEFUN |objectMember?| (|x| |l|) @@ -318,3 +320,6 @@ ((CHAR= (SCHAR |s| |k|) |c|) (RETURN |k|)) (T (SETQ |k| (+ |k| 1))))))))) +(DEFUN |finishLine| (|out|) + (PROGN (TERPRI |out|) (FORCE-OUTPUT |out|))) + |