diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-12-11 01:50:29 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-12-11 01:50:29 +0000 |
| commit | 46e765be689a737fa233ca242459520db3797f03 (patch) | |
| tree | 6c04f7b33f3caeea9c7bbca67e443677a358a7d4 /src/boot | |
| parent | c95606b43200927a9b54c5bba9670020aee6712d (diff) | |
| download | open-axiom-46e765be689a737fa233ca242459520db3797f03.tar.gz | |
Clean up
Diffstat (limited to 'src/boot')
| -rw-r--r-- | src/boot/includer.boot | 4 | ||||
| -rw-r--r-- | src/boot/strap/tokens.clisp | 3 | ||||
| -rw-r--r-- | src/boot/tokens.boot | 1 | ||||
| -rw-r--r-- | src/boot/translator.boot | 6 |
4 files changed, 8 insertions, 6 deletions
diff --git a/src/boot/includer.boot b/src/boot/includer.boot index e7b7dc52..b0c72019 100644 --- a/src/boot/includer.boot +++ b/src/boot/includer.boot @@ -79,7 +79,7 @@ char x == -- returns the string representation of object X. STRINGIMAGE x == - WRITE_-TO_-STRING x + toString x -- close STREAM. shoeCLOSE stream == @@ -102,7 +102,7 @@ shoeReadLine stream == -- write LINE to standard terminal I/O. shoeConsole line == - WRITE_-LINE(line, _*TERMINAL_-IO_*) + writeLine(line, _*TERMINAL_-IO_*) shoeSpaces n == MAKE_-FULL_-CVEC(n, '".") diff --git a/src/boot/strap/tokens.clisp b/src/boot/strap/tokens.clisp index 81c97675..d64068f8 100644 --- a/src/boot/strap/tokens.clisp +++ b/src/boot/strap/tokens.clisp @@ -233,7 +233,8 @@ (LIST '|substitute| 'SUBST) (LIST '|substitute!| 'NSUBST) (LIST '|symbol?| 'SYMBOLP) (LIST '|take| 'TAKE) - (LIST '|third| 'CADDR) (LIST '|true| 'T) + (LIST '|third| 'CADDR) + (LIST '|toString| 'WRITE-TO-STRING) (LIST '|true| 'T) (LIST '|upperCase?| 'UPPER-CASE-P) (LIST '|vector?| 'SIMPLE-VECTOR-P) (LIST '|writeByte| 'WRITE-BYTE) diff --git a/src/boot/tokens.boot b/src/boot/tokens.boot index 476d0a62..62c33b56 100644 --- a/src/boot/tokens.boot +++ b/src/boot/tokens.boot @@ -289,6 +289,7 @@ for i in [ _ ["symbol?", "SYMBOLP"] , _ ["take", "TAKE"] , ["third", "CADDR"] , _ + ["toString", "WRITE-TO-STRING"], _ ["true", "T"] , _ ["upperCase?", "UPPER-CASE-P"], _ ["vector?", "SIMPLE-VECTOR-P"], _ diff --git a/src/boot/translator.boot b/src/boot/translator.boot index 046b1f43..001901ab 100644 --- a/src/boot/translator.boot +++ b/src/boot/translator.boot @@ -324,7 +324,7 @@ shoeConsoleLines lines == shoeConsole '" " shoeFileLine(x, stream) == - WRITE_-LINE(x, stream) + writeLine(x, stream) x shoeFileTrees(s,st)== @@ -697,7 +697,7 @@ PSTTOMC string== BOOTLOOP() == a:=READ_-LINE() #a=0=> - WRITE_-LINE '"Boot Loop; to exit type ] " + writeLine '"Boot Loop; to exit type ] " BOOTLOOP() b:=shoePrefix? ('")console",a) b => @@ -711,7 +711,7 @@ BOOTLOOP() == BOOTPO() == a:=READ_-LINE() #a=0=> - WRITE_-LINE '"Boot Loop; to exit type ] " + writeLine '"Boot Loop; to exit type ] " BOOTPO() b:=shoePrefix? ('")console",a) b => |