From 92be0e2e26c213a19d684bbfea11730bd386db88 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Thu, 14 May 2026 12:19:26 +0300 Subject: [PATCH] pstk fixes on Kawa, Chicken and STklos --- Makefile | 4 ++-- retropikzel/named-pipes/VERSION | 2 +- retropikzel/pstk.scm | 18 +++++++----------- retropikzel/pstk.sld | 6 +++++- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 90b71e3..4112c5c 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ SCHEME=chibi -DOCKER_TAG=head +DOCKER_TAG=latest RNRS=r7rs LIBRARY=system AUTHOR=Retropikzel @@ -66,7 +66,7 @@ test-docker: testfiles DOCKER_TAG=${DOCKER_TAG} \ COMPILE_R7RS=${SCHEME} \ CSC_OPTIONS="${CSC_OPTIONS}" \ - SNOW_PACKAGES="srfi.64 srfi.170 foreign.c retropikzel.system retropikzel.named-pipes ${PKG}" \ + SNOW_PACKAGES="foreign.c srfi.64 srfi.170 retropikzel.system retropikzel.named-pipes ${PKG}" \ APT_PACKAGES="${APT_PACKAGES}" \ test-r7rs -o test-program test.${SFX} diff --git a/retropikzel/named-pipes/VERSION b/retropikzel/named-pipes/VERSION index 21e8796..ee90284 100644 --- a/retropikzel/named-pipes/VERSION +++ b/retropikzel/named-pipes/VERSION @@ -1 +1 @@ -1.0.3 +1.0.4 diff --git a/retropikzel/pstk.scm b/retropikzel/pstk.scm index 5952be5..77acf97 100644 --- a/retropikzel/pstk.scm +++ b/retropikzel/pstk.scm @@ -1,15 +1,7 @@ (define (temp-name) - (random-source-randomize! default-random-source) - (let ((file (string-append "/tmp/pstk-" - (number->string (random-integer 1000)) - "-" - (number->string (random-integer 1000)) - "-" - (number->string (random-integer 1000))))) - (if (file-exists? file) - (temp-name) - file))) - + (let ((filename (create-temp-file "pstk."))) + (delete-file filename) + filename)) (define wish-display pipe-write-string) (define wish-read (lambda (pipe) (let ((result (pipe-read pipe))) @@ -41,17 +33,21 @@ (define *use-keywords?* (cond-expand + (chicken #t) + (kawa #t) (stklos #t) (else #f))) (define (%keyword? x) (cond-expand + (chicken (keyword? x)) (kawa (keyword? x)) (srfi-88 (keyword? x)) (else (error "Keywords not supported" x)))) (define (%keyword->string x) (cond-expand + (chicken (keyword->string x)) (kawa (keyword->string x)) (stklos (keyword->string x)) (else (error "Keywords not supported" x)))) diff --git a/retropikzel/pstk.sld b/retropikzel/pstk.sld index abcbf0a..5ec252c 100644 --- a/retropikzel/pstk.sld +++ b/retropikzel/pstk.sld @@ -108,7 +108,11 @@ (scheme process-context) (retropikzel named-pipes) (retropikzel system) - (srfi 27)) + (srfi 170)) + (cond-expand + ;; Temporary workaround because of https://github.com/egallesio/STklos/issues/888 + (stklos (import (only (stklos) create-temp-file))) + (else)) (export tk-eval tk-id->widget tk-var