From a193ac031e1ee458b334a181eb35c518e7c00d5a Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Mon, 28 Aug 2023 23:22:11 -0500 Subject: Rename arguments for clarity --- schmaltz.sls | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/schmaltz.sls b/schmaltz.sls index c47467a..a5becac 100644 --- a/schmaltz.sls +++ b/schmaltz.sls @@ -6,45 +6,45 @@ (case-lambda (() (render (current-input-port) (render-environment))) - ((port) - (render port (render-environment))) - ((port env) - (let loop ((ch (read-char port)) + ((in) + (render in (render-environment))) + ((in env) + (let loop ((ch (read-char in)) (acc '())) (cond ((not ch) ; after an expansion - (loop (read-char port) acc)) + (loop (read-char in) acc)) ((eof-object? ch) ; end of file - (list->string (reverse acc))) - ((eq? ch #\#) ; expansion - (let* ((next (peek-char port)) + (display (list->string (reverse acc)))) + ((eq? ch #\#) ; expansion + (let* ((next (peek-char in)) (proc (assq-ref next (render-specials)))) (cond ((eq? next #\\) ; escape character -- #\,( => #,( - (read-char port) ; skip the \ - (loop (read-char port) ; continue + (read-char in) ; skip the \ + (loop (read-char in) ; continue (cons ch acc))) ((not proc) ; this character isn't special - (loop (read-char port) ; continue + (loop (read-char in) ; continue (cons ch acc))) (else ; look up the reader and run it - (read-char port) ; skip the character - (loop #f (append (let* ((ins (displayed (eval (proc port) env))) + (read-char in) ; skip the character + (loop #f (append (let* ((ins (displayed (eval (proc in) env))) (out (assoc ins (render-unprintables)))) (if out ((cdr out) next) (reverse (string->list ins)))) acc)))))) - (else (loop (read-char port) ; normal character + (else (loop (read-char in) ; normal character (cons ch acc)))))))) (define render-string (case-lambda - ((s) (render-string s (interaction-environment))) - ((s env) - (call-with-port (open-input-string s) - (lambda (port) - (render env port)))))) + ((str) (render-string str (interaction-environment))) + ((str env) + (call-with-port (open-input-string str) + (lambda (in) + (render env in)))))) (define (render->string . args) (call-with-port (open-output-string) -- cgit 1.4.1-21-gabe81