Hi all,
Here's a patch to change the name of the read/source-info we export from
chicken.syntax. This avoids a problem we've been seeing on the
Salmonella machines with hanging processes.
Cheers,
Peter
From 520c12c7642448af2bc1c6e0a1790794d06dc2d4 Mon Sep 17 00:00:00 2001
From: Peter Bex
Date: Tue, 11 Jul 2023 15:40:45 +0200
Subject: [PATCH] Change official name of read/source-info to avoid conflict
Somehow, when using an older compiler to bootstrap, read/source-info
from support.scm was referencing itself, even though it refers to
chicken.syntax#read-with-source-info explicitly. This caused the
Salmonella test servers to hang.
At some point, we'll have to find out why this happened, but for now
let's take the easy way out and rename the officially exported name to
the full name "read-with-source-info".
---
DEPRECATED | 6 +++---
NEWS | 6 +++---
batch-driver.scm | 2 +-
csi.scm| 6 +++---
eval.scm | 10 +-
expand.scm | 10 +-
manual/Module (chicken syntax) | 6 +++---
repl.scm | 2 +-
support.scm| 2 +-
types.db | 2 +-
10 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/DEPRECATED b/DEPRECATED
index 6315e591..6c2a009e 100644
--- a/DEPRECATED
+++ b/DEPRECATED
@@ -2,9 +2,9 @@ Deprecated functions and variables
==
5.3.1
-- read/source-info was moved from the internal, undocumented module
- (chicken compiler support) into (chicken syntax). Using it from
- the former module is deprecated.
+- read/source-info from the internal, undocumented module
+ (chicken compiler support) is deprecated. Instead, use
+ read-with-source-info from (chicken syntax).
5.2.1
- current-milliseconds and its C implementations C_milliseconds and
diff --git a/NEWS b/NEWS
index 68940ef5..a371ff8e 100644
--- a/NEWS
+++ b/NEWS
@@ -21,9 +21,9 @@
filename. Previously, the directory part would be stripped.
- Added support for embedded strings and characters in SRFI-4 vector
literals.
- - read/source-info is now documented and officially supported, from
-the (chicken syntax) module. It is still exported from the
-undocumented internal (chicken compiler support) module, but
+ - read-with-source-info is now documented and officially supported,
+from the (chicken syntax) module. read/source-info is still exported
+from the undocumented internal (chicken compiler support) module, but
using it from there is deprecated.
- Tools
diff --git a/batch-driver.scm b/batch-driver.scm
index f0a5fc08..8f0a4f35 100644
--- a/batch-driver.scm
+++ b/batch-driver.scm
@@ -609,7 +609,7 @@
(in (check-and-open-input-file f)) )
(fluid-let ((##sys#current-source-filename f))
(let loop ()
- (let ((x (chicken.syntax#read/source-info in))) ;
OBSOLETE - after bootstrapping we can get rid of this explicit namespacing
+ (let ((x (chicken.syntax#read-with-source-info
in))) ; OBSOLETE - after bootstrapping we can get rid of this explicit
namespacing
(cond ((eof-object? x)
(close-checked-input-file in f) )
diff --git a/csi.scm b/csi.scm
index 28ab16a0..63ff4221 100644
--- a/csi.scm
+++ b/csi.scm
@@ -280,7 +280,7 @@ EOF
(define default-evaluator
(let ((eval eval)
(load-noisily load-noisily)
- (read (lambda () (chicken.syntax#read/source-info
(current-input-port ; OBSOLETE - after bootstrapping we can get rid of this
explicit namespacing
+ (read (lambda () (chicken.syntax#read-with-source-info
(current-input-port ; OBSOLETE - after bootstrapping we can get rid of this
explicit namespacing
(read-line read-line)
(display display)
(string-split string-split)
@@ -1047,8 +1047,8 @@ EOF
(load home-fn) ) ) ) )
(define (evalstring str #!optional (rec (lambda _ (void
(let ((in (open-input-string str))
- (read/source-info chicken.syntax#read/source-info)) ; OBSOLETE -
after bootstrapping we can get rid of this explicit namespacing
- (do ([x (read/source-info in) (read/source-info in)])
+ (read-with-source-info chicken.syntax#read-with-source-info)) ;
OBSOLETE - after bootstrapping we can get rid of this explicit namespacing
+ (do ([x (read-with-source-info in) (read-with-source-info in)])
((eof-object? x))
(rec (receive (eval x))) ) ) )
(when (member* '("-h" "-help" "--help") args)
diff --git a/eval.scm b/eval.scm
index d54be504..929acc38 100644
--- a/eval.scm
+++ b/eval.scm
@@ -1079,7 +1079,7 @@
(##sys#current-load-filename fname)
