diff options
| -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 | ||||
| -rw-r--r-- | src/interp/format.boot | 6 | ||||
| -rw-r--r-- | src/interp/i-output.boot | 6 | ||||
| -rw-r--r-- | src/interp/sys-constants.boot | 2 |
7 files changed, 15 insertions, 13 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 => diff --git a/src/interp/format.boot b/src/interp/format.boot index 9f58ceb6..f322e9a0 100644 --- a/src/interp/format.boot +++ b/src/interp/format.boot @@ -392,7 +392,7 @@ form2String1 u == formWrapId u SUBRP u => formWrapId BPINAME u string? u => formWrapId u - formWrapId WRITE_-TO_-STRING u + formWrapId toString u u1 := u [op,:argl] := u op='Join or op= 'mkCategory => formJoin1(op,argl) @@ -735,12 +735,12 @@ object2String x == IDENTP x => PNAME x null x => '"" cons? x => strconc(object2String first x, object2String rest x) - WRITE_-TO_-STRING x + toString x object2Identifier x == IDENTP x => x string? x => INTERN x - INTERN WRITE_-TO_-STRING x + INTERN toString x blankList x == "append"/[[BLANK,y] for y in x] diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot index 5602b11e..40ad756c 100644 --- a/src/interp/i-output.boot +++ b/src/interp/i-output.boot @@ -2619,7 +2619,7 @@ primaryForm2String x == x = "$" => '"%" x = "$$" => '"%%" SYMBOL_-NAME x - atom x => WRITE_-TO_-STRING x + atom x => toString x strconc('"(",inputForm2String x, '")") callForm2String x == @@ -2636,8 +2636,8 @@ callForm2String x == op = "$elt" => typedForm2String("$", second args, first args) op is ["$elt",t,op'] => typedForm2String("$",[op',:args], t) "strconc"/[inputForm2String op, '"(",:args','")"] where - args' := [toString(a,i) for a in args for i in 0..] - toString(a,i) == + args' := [stringify(a,i) for a in args for i in 0..] + stringify(a,i) == i = 0 => inputForm2String a strconc('",",inputForm2String a) diff --git a/src/interp/sys-constants.boot b/src/interp/sys-constants.boot index eebbc95d..c8e454d3 100644 --- a/src/interp/sys-constants.boot +++ b/src/interp/sys-constants.boot @@ -295,7 +295,7 @@ $TriangleVariableList == $AtVariables == - [INTERN strconc('"@",WRITE_-TO_-STRING i) for i in 1..50] + [INTERN strconc('"@",toString i) for i in 1..50] ++ List of basic predicates the system has a built-in optimization ++ support for. |