diff --git a/scheme/browse-directory-list.scm b/scheme/browse-directory-list.scm index 5e748ed..164c63c 100644 --- a/scheme/browse-directory-list.scm +++ b/scheme/browse-directory-list.scm @@ -198,7 +198,7 @@ self))) (define (prepare-selection-for-scheme-mode file-names) - (string-append "'" (exp->string file-names))) + (string-append "'" (write-to-string file-names))) ;; FIXME: quote file names containing space etc (define (prepare-selection-for-command-mode file-names) @@ -222,11 +222,11 @@ (make-focus-object-reference focus-object-table obj)))) (if (null? marked) - (exp->string + (write-to-string (make-reference (select-list-selected-entry select-list))) (string-append "(list " - (string-join (map exp->string (map make-reference marked))) + (string-join (map write-to-string (map make-reference marked))) ")")))) (lambda (message) diff --git a/scheme/inspector.scm b/scheme/inspector.scm index 96ed73a..aa01aa8 100644 --- a/scheme/inspector.scm +++ b/scheme/inspector.scm @@ -44,7 +44,7 @@ (substring str 0 (min (string-length str) max-length))))) (define (prepare-selection-for-scheme-mode file-names) - (string-append "'" (exp->string file-names))) + (string-append "'" (write-to-string file-names))) (define (continuation-debug-data thing) (template-debug-data (continuation-template thing))) @@ -158,11 +158,11 @@ (make-focus-object-reference focus-object-table obj)))) (if (null? marked) - (exp->string + (write-to-string (make-reference (select-list-selected-entry selection-list))) (string-append "(list " - (string-join (map exp->string (map make-reference marked))) + (string-join (map write-to-string (map make-reference marked))) ")")))) (define (get-selection-as-text self for-scheme-mode? focus-object-table) diff --git a/scheme/nuit-packages.scm b/scheme/nuit-packages.scm index d9ed6c0..c0edc81 100644 --- a/scheme/nuit-packages.scm +++ b/scheme/nuit-packages.scm @@ -10,7 +10,7 @@ (define-interface utils-interface (export display-to-string - exp->string)) + write-to-string)) (define-structure utils utils-interface (open scheme diff --git a/scheme/process.scm b/scheme/process.scm index c257c30..cebb63a 100644 --- a/scheme/process.scm +++ b/scheme/process.scm @@ -57,7 +57,7 @@ (select-list-selected-entry select-list)))) (for-scheme-mode? (string-append - "'" (exp->string (map process-info-pid marked)))) + "'" (write-to-string (map process-info-pid marked)))) (else (string-join (map number->string diff --git a/scheme/select-list.scm b/scheme/select-list.scm index ef6e22d..0a38ea2 100644 --- a/scheme/select-list.scm +++ b/scheme/select-list.scm @@ -194,10 +194,10 @@ (make-focus-object-reference focus-object-table obj)))) (if (null? marked) - (exp->string + (write-to-string (make-reference (select-list-selected-entry select-list))) (string-append "(list " - (string-join (map exp->string (map make-reference marked))) + (string-join (map write-to-string (map make-reference marked))) ")"))))) diff --git a/scheme/std-viewer.scm b/scheme/std-viewer.scm index d86c5b2..b164a24 100644 --- a/scheme/std-viewer.scm +++ b/scheme/std-viewer.scm @@ -3,7 +3,7 @@ (y 1) (value value) (text (layout-result-standard - (exp->string value) + (write-to-string value) (result-buffer-num-cols buffer)))) (lambda (message) (debug-message "message for make-standard-viewer" message) diff --git a/scheme/user-group-info.scm b/scheme/user-group-info.scm index d025bc8..ac9fa81 100644 --- a/scheme/user-group-info.scm +++ b/scheme/user-group-info.scm @@ -108,7 +108,7 @@ (result-buffer-num-lines buffer)))) (define (prepare-selection-for-scheme-mode infos) - (string-append "'" (exp->string (map cdr infos)))) + (string-append "'" (write-to-string (map cdr infos)))) (define (prepare-selection-for-command-mode infos) (string-join @@ -137,7 +137,7 @@ (string-append "(list " (string-join - (map exp->string + (map write-to-string (map make-reference (map cdr infos)))) ")"))) @@ -252,7 +252,7 @@ (define (prepare-selection-for-scheme-mode infos) (string-append "'" - (exp->string + (write-to-string (map group-info-element->value infos)))) (define (get-selection-as-text self for-scheme-mode? @@ -273,7 +273,7 @@ (string-append "(list " (string-join - (map exp->string + (map write-to-string (map make-reference (map group-info-element->value infos)))) ")"))) @@ -334,7 +334,7 @@ (define (prepare-selection-for-scheme-mode infos) (string-append "'" - (exp->string + (write-to-string (map user-info-element->value infos)))) (define (get-selection-as-text self for-scheme-mode? @@ -355,7 +355,7 @@ (string-append "(list " (string-join - (map exp->string + (map write-to-string (map make-reference (map user-info-element->value infos)))) ")")))