Change `char->string' to `string'. `char->string' still defined as

alias.

diff --git a/v7/src/runtime/char.scm b/v7/src/runtime/char.scm
index e792675c2243bf8369d4c2733e58e38d4a84f2d7..34636532a1563c95fff74c96190d8ade50c8bf2e 100644 (file)
--- a/v7/src/runtime/char.scm
+++ b/v7/src/runtime/char.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/char.scm,v 14.1 1988/06/13 11:41:03 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/char.scm,v 14.2 1988/10/15 17:19:05 cph Rel $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -250,9 +250,9 @@ MIT in each case. |#
                        (or (char=? base-char backslash-char)
                            (char-set-member? char-set/atom-delimiters
                                              base-char)))
-                  (string-append "\\" (char->string base-char)))
+                  (string-append "\\" (string base-char)))
                  ((char-graphic? base-char)
-                  (char->string base-char))
+                  (string base-char))
                  (else
                   (string-append "<code "
                                  (write-to-string code)

diff --git a/v7/src/runtime/parse.scm b/v7/src/runtime/parse.scm
index c8cab44a1b34cebf9b728e0975de18c83372b810..a7f20699cef7e51addea20cba406a04d386cb5a7 100644 (file)
--- a/v7/src/runtime/parse.scm
+++ b/v7/src/runtime/parse.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/parse.scm,v 14.4 1988/08/05 20:48:25 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/parse.scm,v 14.5 1988/10/15 17:19:10 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -277,7 +277,7 @@ MIT in each case. |#
 (define (parse-object/numeric-prefix)
   (let ((number
         (let ((char (read-char)))
-          (string-append (char->string #\# char) (read-atom)))))
+          (string-append (string #\# char) (read-atom)))))
     (or (parse-number number)
        (parse-error "Bad number syntax" number))))
 
@@ -407,9 +407,9 @@ MIT in each case. |#
 (define (parse-object/string-quote)
   (discard-char)
   (let loop ()
-    (let ((string (read-string char-set/string-delimiters)))
+    (let ((head (read-string char-set/string-delimiters)))
       (if (char=? #\" (read-char))
-         string
+         head
          (let ((char
                 (let ((char (read-char)))
                   (cond ((char-ci=? char #\t) #\Tab)
@@ -417,11 +417,11 @@ MIT in each case. |#
                         ((char-ci=? char #\f) #\Page)
                         ((char->digit char 8)
                          (octal->char
-                          (string-append (char->string char)
+                          (string-append (string char)
                                          (read-string char-set/not-octal))))
                         (else char)))))
-           (string-append string
-                          (char->string char)
+           (string-append head
+                          (string char)
                           (loop)))))))
 
 (define (octal->char string)
@@ -448,9 +448,9 @@ MIT in each case. |#
        (let loop ()
         (cond ((char=? #\\ (peek-char))
                (discard-char)
-               (char->string (read-char)))
+               (string (read-char)))
               ((char-set-member? char-set/char-delimiters (peek-char))
-               (char->string (read-char)))
+               (string (read-char)))
               (else
                (let ((string (read-string char-set/char-delimiters)))
                  (if (let ((char (peek-char/eof-ok)))

diff --git a/v7/src/runtime/string.scm b/v7/src/runtime/string.scm
index 339b36465a68ba6c17914013038244e10af1cbdd..c21a76796bf74babaa41e66e5d1ebdeefda4f1a6 100644 (file)
--- a/v7/src/runtime/string.scm
+++ b/v7/src/runtime/string.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/string.scm,v 14.1 1988/06/13 11:51:44 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/string.scm,v 14.2 1988/10/15 17:19:16 cph Rel $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -195,9 +195,11 @@ MIT in each case. |#
                 (loop (1+ index) (cdr chars)))))
     (loop 0 chars)))
 
-(define (char->string . chars)
+(define (string . chars)
   (list->string chars))
 
+(define char->string string)
+
 (define (string->list string)
   (substring->list string 0 (string-length string)))
 

diff --git a/v7/src/runtime/strott.scm b/v7/src/runtime/strott.scm
index 6fce9150c11d60d67b9fdf7b097178019b45640e..3a396db9294f555e13b7fe926abafb28840beeca 100644 (file)
--- a/v7/src/runtime/strott.scm
+++ b/v7/src/runtime/strott.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/Attic/strott.scm,v 14.2 1988/06/13 11:51:56 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/Attic/strott.scm,v 14.3 1988/10/15 17:19:21 cph Rel $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -66,6 +66,19 @@ MIT in each case. |#
   accumulator
   counter)
 
+(define (operation/write-char port char)
+  (let ((state (output-port/state port)))
+    (let ((accumulator (output-string-state/accumulator state))
+         (counter (output-string-state/counter state)))
+      (if (zero? counter)
+         ((output-string-state/return state)
+          (cons true (apply string-append (reverse! accumulator))))
+         (begin
+           (set-output-string-state/accumulator!
+            state
+            (cons (string char) accumulator))
+           (set-output-string-state/counter! state (-1+ counter)))))))
+
 (define (operation/write-string port string)
   (let ((state (output-port/state port)))
     (let ((accumulator (cons string (output-string-state/accumulator state)))
@@ -81,9 +94,6 @@ MIT in each case. |#
            (set-output-string-state/accumulator! state accumulator)
            (set-output-string-state/counter! state counter))))))
 
-(define (operation/write-char port char)
-  (operation/write-string port (char->string char)))
-
 (define (operation/print-self state port)
   port
-  (unparse-string state "to string (truncated)"))
\ No newline at end of file
+  (unparse-string state "to string (truncating)"))
\ No newline at end of file

diff --git a/v7/src/runtime/strout.scm b/v7/src/runtime/strout.scm
index 670da734cac85f7a909fc555dcd302e0e1a4ca3b..452085b74405e6b9d8e192a428b324b26adb5ff6 100644 (file)
--- a/v7/src/runtime/strout.scm
+++ b/v7/src/runtime/strout.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/Attic/strout.scm,v 14.2 1988/06/13 11:52:01 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/Attic/strout.scm,v 14.3 1988/10/15 17:19:25 cph Rel $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -53,11 +53,11 @@ MIT in each case. |#
 
 (define output-string-template)
 
-(define-integrable (operation/write-string port string)
-  (set-output-port/state! port (cons string (output-port/state port))))
-
 (define (operation/write-char port char)
-  (operation/write-string port (char->string char)))
+  (set-output-port/state! port (cons (string char) (output-port/state port))))
+
+(define (operation/write-string port string)
+  (set-output-port/state! port (cons string (output-port/state port))))
 
 (define (operation/print-self state port)
   port

diff --git a/v7/src/runtime/unpars.scm b/v7/src/runtime/unpars.scm
index 353e3743b01c904558550de36d4a3b559b9365c1..e894efd92746333aaa4337693c28caf6494fcd39 100644 (file)
--- a/v7/src/runtime/unpars.scm
+++ b/v7/src/runtime/unpars.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/unpars.scm,v 14.5 1988/07/16 18:54:39 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/unpars.scm,v 14.6 1988/10/15 17:19:29 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -315,9 +315,9 @@ MIT in each case. |#
 (define (char->octal char)
   (let ((qr1 (integer-divide (char->ascii char) 8)))
     (let ((qr2 (integer-divide (integer-divide-quotient qr1) 8)))
-      (char->string (digit->char (integer-divide-quotient qr2) 8)
-                   (digit->char (integer-divide-remainder qr2) 8)
-                   (digit->char (integer-divide-remainder qr1) 8)))))
+      (string (digit->char (integer-divide-quotient qr2) 8)
+             (digit->char (integer-divide-remainder qr2) 8)
+             (digit->char (integer-divide-remainder qr1) 8)))))
 
 (define string-delimiters)